durcno 1.0.0-alpha.5 → 1.0.0-alpha.6

package/dist/bin.cjs

@@ -12063,13 +12063,16 @@ var Column = class {
 };
 
 // src/constraints/check.ts
+function isExprColumnRef(value) {
+  return typeof value === "object" && value !== null && value.type === "col";
+}
 function snapshotExprToSQL(expr) {
   if (expr.type === "raw") {
     return expr.sql;
   }
   if (expr.type === "comparison") {
-    const left = typeof expr.left === "string" ? `"${expr.left}"` : snapshotExprToSQL(expr.left);
-    const right = formatSnapshotValue(expr.right);
+    const left = isExprColumnRef(expr.left) ? `"${expr.left.name}"` : snapshotExprToSQL(expr.left);
+    const right = isExprColumnRef(expr.right) ? `"${expr.right.name}"` : expr.right;
     return `${left} ${expr.op} ${right}`;
   }
   if (expr.type === "logical") {
@@ -12078,24 +12081,11 @@ function snapshotExprToSQL(expr) {
     return wrappedParts.join(` ${expr.op} `);
   }
   if (expr.type === "function") {
-    const args = expr.args.map(
-      (a) => typeof a === "string" ? `"${a}"` : formatSnapshotValue(a)
-    );
+    const args = expr.args.map((a) => isExprColumnRef(a) ? `"${a.name}"` : a);
     return `${expr.name}(${args.join(", ")})`;
   }
   throw new Error("Unknown expression type");
 }
-function formatSnapshotValue(value) {
-  if (value === null) return "NULL";
-  if (Array.isArray(value)) {
-    const list = value.map((v) => formatSnapshotValue(v)).join(", ");
-    return `(${list})`;
-  }
-  if (typeof value === "string") return `'${value.replace(/'/g, "''")}'`;
-  if (typeof value === "number") return String(value);
-  if (typeof value === "boolean") return value ? "TRUE" : "FALSE";
-  return String(value);
-}
 
 // src/cli/utils.ts
 function getOrderedDependencies(items, dependencyMap) {
@@ -13508,7 +13498,7 @@ async function status(options) {
 }
 
 // src/cli/index.ts
-program.version("1.0.0-alpha.4");
+program.version("1.0.0-alpha.5");
 var Options = {
   config: ["--config <path>", "Path to the config file"]
 };

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

@@ -3,18 +3,18 @@ import { Column, ColumnConfig } from "./common.mjs";
 import * as z from "zod";
 
 //#region src/columns/bigint.d.ts
-type BigintValType = number;
+type BigintValType = bigint;
 type BigintConfig = ColumnConfig;
 declare class BigintColumn<TConfig extends BigintConfig> extends Column<TConfig, BigintValType> {
   static readonly id = "Column.Bigint";
   get sqlTypeScalar(): string;
   get sqlCastScalar(): null;
-  get zodTypeScaler(): z.ZodCoercedNumber<unknown>;
-  toDriverScalar(value: BigintValType | Sql | null): string | number | null;
-  toSQLScalar(value: number | Sql | null): string;
-  fromDriverScalar(value: number | string | null): BigintValType | null;
+  get zodTypeScaler(): z.ZodCoercedBigInt<unknown>;
+  toDriverScalar(value: BigintValType | Sql | null): string | null;
+  toSQLScalar(value: BigintValType | Sql | null): string;
+  fromDriverScalar(value: bigint | string | null): BigintValType | null;
 }
-/** Creates a `bigint` column. PostgreSQL 64-bit signed integer, maps to `number`. */
+/** Creates a `bigint` column. PostgreSQL 64-bit signed integer, maps to `bigint`. */
 declare function bigint<TConfig extends BigintConfig>(config: TConfig): BigintColumn<TConfig>;
 //#endregion
 export { BigintColumn, bigint };

package/dist/src/columns/bigint.mjs

@@ -11,11 +11,11 @@ var BigintColumn = class extends Column {
 		return null;
 	}
 	get zodTypeScaler() {
-		return z.coerce.number();
+		return z.coerce.bigint();
 	}
 	toDriverScalar(value) {
 		if (value === null) return null;
-		return value instanceof Sql ? value.string : value;
+		return value instanceof Sql ? value.string : value.toString();
 	}
 	toSQLScalar(value) {
 		if (value === null) return "NULL";
@@ -24,10 +24,10 @@ var BigintColumn = class extends Column {
 	}
 	fromDriverScalar(value) {
 		if (value === null) return null;
-		return typeof value === "string" ? parseInt(value, 10) : value;
+		return BigInt(value);
 	}
 };
-/** Creates a `bigint` column. PostgreSQL 64-bit signed integer, maps to `number`. */
+/** Creates a `bigint` column. PostgreSQL 64-bit signed integer, maps to `bigint`. */
 function bigint(config) {
 	return new BigintColumn(config);
 }

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

@@ -3,7 +3,7 @@ import { Column, ColumnConfig } from "./common.mjs";
 import * as z from "zod";
 
 //#region src/columns/bigserial.d.ts
-type BigserialValType = number;
+type BigserialValType = bigint;
 type BigserialConfig = Pick<ColumnConfig, "primaryKey" | "unique">;
 type BigserialInternalConfig<TConfig extends BigserialConfig> = TConfig & {
   generated: "BY DEFAULT";
@@ -14,12 +14,12 @@ declare class BigserialColumn<TConfig extends BigserialConfig> extends Column<Bi
   constructor(config: TConfig);
   get sqlTypeScalar(): string;
   get sqlCastScalar(): null;
-  get zodTypeScaler(): z.ZodCoercedNumber<unknown>;
-  toDriverScalar(value: BigserialValType | Sql | null): string | number | null;
-  toSQLScalar(value: number | Sql | null): string;
-  fromDriverScalar(value: number | string | null): BigserialValType | null;
+  get zodTypeScaler(): z.ZodCoercedBigInt<unknown>;
+  toDriverScalar(value: BigserialValType | Sql | null): string | null;
+  toSQLScalar(value: BigserialValType | Sql | null): string;
+  fromDriverScalar(value: BigserialValType | string | null): BigserialValType | null;
 }
-/** Creates a `bigserial` column. Auto-incrementing 64-bit integer, implicitly `NOT NULL`. Maps to `number`. */
+/** Creates a `bigserial` column. Auto-incrementing 64-bit integer, implicitly `NOT NULL`. Maps to `bigint`. */
 declare function bigserial<TConfig extends BigserialConfig>(config: TConfig): BigserialColumn<TConfig>;
 //#endregion
 export { bigserial };

package/dist/src/columns/bigserial.mjs

@@ -14,11 +14,11 @@ var BigserialColumn = class extends Column {
 		return null;
 	}
 	get zodTypeScaler() {
-		return z.coerce.number();
+		return z.coerce.bigint();
 	}
 	toDriverScalar(value) {
 		if (value === null) return null;
-		return value instanceof Sql ? value.string : value;
+		return value instanceof Sql ? value.string : value.toString();
 	}
 	toSQLScalar(value) {
 		if (value === null) return "NULL";
@@ -27,10 +27,10 @@ var BigserialColumn = class extends Column {
 	}
 	fromDriverScalar(value) {
 		if (value === null) return null;
-		return typeof value === "string" ? parseInt(value, 10) : value;
+		return BigInt(value);
 	}
 };
-/** Creates a `bigserial` column. Auto-incrementing 64-bit integer, implicitly `NOT NULL`. Maps to `number`. */
+/** Creates a `bigserial` column. Auto-incrementing 64-bit integer, implicitly `NOT NULL`. Maps to `bigint`. */
 function bigserial(config) {
 	return new BigserialColumn(config);
 }

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

@@ -29,11 +29,21 @@ type CheckExpr = ComparisonExpr | LogicalExpr | FunctionExpr | RawExpr;
 type SnapshotComparisonOp = "=" | "<>" | "<" | ">" | "<=" | ">=" | "IN" | "NOT IN";
 type SnapshotPatternOp = "LIKE" | "SIMILAR TO" | "~";
 type SnapshotLogicalOp = "AND" | "OR";
+/**
+ * A tagged column reference stored in a snapshot expression.
+ * Stores the snake_case column name so it can be quoted correctly in SQL output.
+ */
+interface ExprColumnRef {
+  type: "col";
+  /** Snake_case column name as used in PostgreSQL (e.g. `user_id`). */
+  name: string;
+}
 interface SnapshotComparisonExpr {
   type: "comparison";
-  left: string | SnapshotFunctionExpr;
+  left: ExprColumnRef | SnapshotFunctionExpr;
   op: SnapshotComparisonOp | SnapshotPatternOp;
-  right: unknown;
+  /** Column ref, or a pre-rendered SQL string (incl. `(v1, v2)` for IN lists). */
+  right: ExprColumnRef | string;
 }
 interface SnapshotLogicalExpr {
   type: "logical";
@@ -43,7 +53,8 @@ interface SnapshotLogicalExpr {
 interface SnapshotFunctionExpr {
   type: "function";
   name: string;
-  args: (string | unknown)[];
+  /** Column refs or pre-rendered SQL strings. */
+  args: (ExprColumnRef | string)[];
 }
 interface SnapshotRawExpr {
   type: "raw";
@@ -60,8 +71,8 @@ declare class CheckBuilder {
   like<TCol extends TableColumn<string, string, Key, AnyColumn>>(col: TCol, pattern: string): ComparisonExpr;
   similarTo<TCol extends TableColumn<string, string, Key, AnyColumn>>(col: TCol, pattern: string): ComparisonExpr;
   regex<TCol extends TableColumn<string, string, Key, AnyColumn>>(col: TCol, pattern: string): ComparisonExpr;
-  in<TCol extends TableColumn<string, string, Key, AnyColumn>>(col: TCol, values: (TCol["ValType"] & (string | number))[]): ComparisonExpr;
-  notIn<TCol extends TableColumn<string, string, Key, AnyColumn>>(col: TCol, values: (TCol["ValType"] & (string | number))[]): ComparisonExpr;
+  in<TCol extends TableColumn<string, string, Key, AnyColumn>>(col: TCol, values: TCol["ValType"][]): ComparisonExpr;
+  notIn<TCol extends TableColumn<string, string, Key, AnyColumn>>(col: TCol, values: TCol["ValType"][]): ComparisonExpr;
   and(...expressions: CheckExpr[]): LogicalExpr;
   or(...expressions: CheckExpr[]): LogicalExpr;
   length<TCol extends TableColumn<string, string, Key, AnyColumn>>(col: TCol): FunctionExpr;

package/dist/src/constraints/check.mjs

@@ -218,35 +218,39 @@ var Check = class {
 function check(name, expr) {
 	return new Check(name, expr);
 }
-function formatValue(value) {
+/**
+* Converts a raw JavaScript value to a SQL literal string.
+* Used as a fallback when no column type context is available.
+*/
+function formatUnknown(value) {
 	if (value === null) return "NULL";
+	if (typeof value === "bigint") return value.toString();
 	if (typeof value === "string") return `'${value.replace(/'/g, "''")}'`;
 	if (typeof value === "number") return String(value);
 	if (typeof value === "boolean") return value ? "TRUE" : "FALSE";
-	if (value instanceof Date) return `'${value.toISOString()}'`;
 	return String(value);
 }
 function exprToSQL(expr) {
 	if (expr.type === "raw") return expr.sql;
 	if (expr.type === "comparison") {
 		let left;
-		if (isTableCol(expr.left)) left = `"${expr.left.name}"`;
+		if (isTableCol(expr.left)) left = `"${expr.left.nameSnake}"`;
 		else if (expr.left.type === "function") left = exprToSQL(expr.left);
 		else left = String(expr.left);
 		if (expr.op === "IN" || expr.op === "NOT IN") {
 			if (Array.isArray(expr.right)) {
-				const list = expr.right.map((v) => isTableCol(v) ? `"${v.name}"` : formatValue(v)).join(", ");
+				const list = expr.right.map((v) => isTableCol(v) ? `"${v.nameSnake}"` : formatUnknown(v)).join(", ");
 				return `${left} ${expr.op} (${list})`;
 			}
-			const singleRight = isTableCol(expr.right) ? `"${expr.right.name}"` : formatValue(expr.right);
+			const singleRight = isTableCol(expr.right) ? `"${expr.right.nameSnake}"` : formatUnknown(expr.right);
 			return `${left} ${expr.op} (${singleRight})`;
 		}
-		const right = isTableCol(expr.right) ? `"${expr.right.name}"` : formatValue(expr.right);
+		const right = isTableCol(expr.right) ? `"${expr.right.nameSnake}"` : isTableCol(expr.left) ? expr.left.toSQL(expr.right) : formatUnknown(expr.right);
 		return `${left} ${expr.op} ${right}`;
 	}
 	if (expr.type === "logical") return `(${expr.expressions.map((e) => exprToSQL(e)).join(` ${expr.op} `)})`;
 	if (expr.type === "function") {
-		const args = expr.args.map((arg) => isTableCol(arg) ? `"${arg.name}"` : formatValue(arg));
+		const args = expr.args.map((arg) => isTableCol(arg) ? `"${arg.nameSnake}"` : formatUnknown(arg));
 		return `${expr.name}(${args.join(", ")})`;
 	}
 	throw new Error("Unknown expression type");
@@ -258,10 +262,24 @@ function exprToSnapshot(expr) {
 	};
 	if (expr.type === "comparison") {
 		let left;
-		if (isTableCol(expr.left)) left = expr.left.name;
-		else if (expr.left.type === "function") left = exprToSnapshot(expr.left);
-		else left = String(expr.left);
-		const right = isTableCol(expr.right) ? expr.right.name : expr.right;
+		if (isTableCol(expr.left)) left = {
+			type: "col",
+			name: expr.left.nameSnake
+		};
+		else left = exprToSnapshot(expr.left);
+		let right;
+		if (isTableCol(expr.right)) right = {
+			type: "col",
+			name: expr.right.nameSnake
+		};
+		else if ((expr.op === "IN" || expr.op === "NOT IN") && Array.isArray(expr.right)) {
+			const refCol = isTableCol(expr.left) ? expr.left : void 0;
+			right = `(${expr.right.map((v) => {
+				if (isTableCol(v)) return `"${v.nameSnake}"`;
+				return refCol ? refCol.toSQL(v) : formatUnknown(v);
+			}).join(", ")})`;
+		} else if (isTableCol(expr.left)) right = expr.left.toSQL(expr.right);
+		else right = formatUnknown(expr.right);
 		return {
 			type: "comparison",
 			left,
@@ -274,34 +292,40 @@ function exprToSnapshot(expr) {
 		op: expr.op,
 		expressions: expr.expressions.map((e) => exprToSnapshot(e))
 	};
-	if (expr.type === "function") return {
-		type: "function",
-		name: expr.name,
-		args: expr.args.map((arg) => isTableCol(arg) ? arg.name : arg)
-	};
+	if (expr.type === "function") {
+		const refCol = expr.args.find(isTableCol);
+		return {
+			type: "function",
+			name: expr.name,
+			args: expr.args.map((arg) => {
+				if (isTableCol(arg)) return {
+					type: "col",
+					name: arg.nameSnake
+				};
+				return refCol ? refCol.toSQL(arg) : formatUnknown(arg);
+			})
+		};
+	}
 	throw new Error("Unknown expression type");
 }
+/** Type guard for {@link ExprColumnRef}. */
+function isExprColumnRef(value) {
+	return typeof value === "object" && value !== null && value.type === "col";
+}
+/** Convert a snapshot expression back to a SQL string. */
 function snapshotExprToSQL(expr) {
 	if (expr.type === "raw") return expr.sql;
 	if (expr.type === "comparison") {
-		const left = typeof expr.left === "string" ? `"${expr.left}"` : snapshotExprToSQL(expr.left);
-		const right = formatSnapshotValue(expr.right);
+		const left = isExprColumnRef(expr.left) ? `"${expr.left.name}"` : snapshotExprToSQL(expr.left);
+		const right = isExprColumnRef(expr.right) ? `"${expr.right.name}"` : expr.right;
 		return `${left} ${expr.op} ${right}`;
 	}
 	if (expr.type === "logical") return expr.expressions.map((e) => snapshotExprToSQL(e)).map((p) => `(${p})`).join(` ${expr.op} `);
 	if (expr.type === "function") {
-		const args = expr.args.map((a) => typeof a === "string" ? `"${a}"` : formatSnapshotValue(a));
+		const args = expr.args.map((a) => isExprColumnRef(a) ? `"${a.name}"` : a);
 		return `${expr.name}(${args.join(", ")})`;
 	}
 	throw new Error("Unknown expression type");
 }
-function formatSnapshotValue(value) {
-	if (value === null) return "NULL";
-	if (Array.isArray(value)) return `(${value.map((v) => formatSnapshotValue(v)).join(", ")})`;
-	if (typeof value === "string") return `'${value.replace(/'/g, "''")}'`;
-	if (typeof value === "number") return String(value);
-	if (typeof value === "boolean") return value ? "TRUE" : "FALSE";
-	return String(value);
-}
 //#endregion
 export { CheckBuilder, check, snapshotExprToSQL };

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

@@ -18,7 +18,6 @@ declare class ArrayContainsFilter<TCol extends AnyTC, TVal extends ArrayElement<
   readonly left: TCol;
   readonly right: TVal[];
   constructor(column: TCol, values: TVal[]);
-  toSQL(): string;
   toQuery(query: Query): void;
 }
 /**
@@ -37,7 +36,6 @@ declare class ArrayContainedByFilter<TCol extends AnyTC, TVal extends ArrayEleme
   readonly left: TCol;
   readonly right: TVal[];
   constructor(column: TCol, values: TVal[]);
-  toSQL(): string;
   toQuery(query: Query): void;
 }
 /**
@@ -53,7 +51,6 @@ declare class ArrayOverlapsFilter<TCol extends AnyTC, TVal extends ArrayElement<
   readonly left: TCol;
   readonly right: TVal[];
   constructor(column: TCol, values: TVal[]);
-  toSQL(): string;
   toQuery(query: Query): void;
 }
 /**
@@ -69,7 +66,6 @@ declare class ArrayHasFilter<TCol extends AnyTC, TVal extends ArrayElement<TCol[
   readonly left: TCol;
   readonly right: TVal;
   constructor(column: TCol, value: TVal);
-  toSQL(): string;
   toQuery(query: Query): void;
 }
 /**
@@ -85,7 +81,6 @@ declare class ArrayAllFilter<TCol extends AnyTC, TVal extends ArrayElement<TCol[
   readonly left: TCol;
   readonly right: TVal;
   constructor(column: TCol, value: TVal);
-  toSQL(): string;
   toQuery(query: Query): void;
 }
 /**

package/dist/src/filters/array.mjs

@@ -12,9 +12,6 @@ var ArrayContainsFilter = class extends Filter {
 		this.left = column;
 		this.right = values;
 	}
-	toSQL() {
-		return `${this.left.fullName} @> ${this.left.toSQL(this.right)}::${this.left.sqlType}`;
-	}
 	toQuery(query) {
 		query.sql += `${this.left.fullName} @> ${this.left.toSQL(this.right)}::${this.left.sqlType}`;
 	}
@@ -41,9 +38,6 @@ var ArrayContainedByFilter = class extends Filter {
 		this.left = column;
 		this.right = values;
 	}
-	toSQL() {
-		return `${this.left.fullName} <@ ${this.left.toSQL(this.right)}::${this.left.sqlType}`;
-	}
 	toQuery(query) {
 		query.sql += `${this.left.fullName} <@ ${this.left.toSQL(this.right)}::${this.left.sqlType}`;
 	}
@@ -67,9 +61,6 @@ var ArrayOverlapsFilter = class extends Filter {
 		this.left = column;
 		this.right = values;
 	}
-	toSQL() {
-		return `${this.left.fullName} && ${this.left.toSQL(this.right)}::${this.left.sqlType}`;
-	}
 	toQuery(query) {
 		query.sql += `${this.left.fullName} && ${this.left.toSQL(this.right)}::${this.left.sqlType}`;
 	}
@@ -93,9 +84,6 @@ var ArrayHasFilter = class extends Filter {
 		this.left = column;
 		this.right = value;
 	}
-	toSQL() {
-		return `${this.left.toSQLScalar(this.right)} = ANY(${this.left.fullName})`;
-	}
 	toQuery(query) {
 		query.sql += `${this.left.toSQLScalar(this.right)} = ANY(${this.left.fullName})`;
 	}
@@ -119,9 +107,6 @@ var ArrayAllFilter = class extends Filter {
 		this.left = column;
 		this.right = value;
 	}
-	toSQL() {
-		return `${this.left.toSQLScalar(this.right)} = ALL(${this.left.fullName})`;
-	}
 	toQuery(query) {
 		query.sql += `${this.left.toSQLScalar(this.right)} = ALL(${this.left.fullName})`;
 	}

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

@@ -5,7 +5,6 @@ import { AnyColumn, TableColumn } from "../table.mjs";
 /** Abstract base class for SQL filter expressions used in `WHERE`/`ON` clauses. */
 declare abstract class Filter<TColumn extends TableColumn<any, any, any, AnyColumn>> {
   readonly $Columns: TColumn;
-  abstract toSQL(): string;
   abstract toQuery(query: Query): void;
 }
 //#endregion

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

@@ -17,14 +17,12 @@ declare class EqualValCondition<CTSchema extends string, CTName extends string,
   readonly left: TableColumn<CTSchema, CTName, CName, Col>;
   readonly right: TRight;
   constructor(field: TableColumn<CTSchema, CTName, CName, Col>, right: TRight);
-  toSQL(): string;
   toQuery(query: Query): void;
 }
 declare class EqualColCondition<C1TSchema extends string, C1TName extends string, C1Name extends Key, C1 extends AnyColumn, C2TSchema extends string, C2TName extends string, C2Name extends Key, C2 extends AnyColumn> {
   readonly left: TableColumn<C1TSchema, C1TName, C1Name, C1>;
   readonly right: TableColumn<C2TSchema, C2TName, C2Name, C2>;
   constructor(field: TableColumn<C1TSchema, C1TName, C1Name, C1>, right: TableColumn<C2TSchema, C2TName, C2Name, C2>);
-  toSQL(): string;
   toQuery(query: Query): void;
 }
 declare function eq<CTSchema extends string, CTName extends string, CName extends Key, Col extends AnyColumn, TRight extends Col["ValType"]>(field: TableColumn<CTSchema, CTName, CName, Col>, right: TRight): EqualValCondition<CTSchema, CTName, CName, Col, TRight>;
@@ -34,14 +32,12 @@ declare class NotEqualValCondition<CTSchema extends string, CTName extends strin
   readonly left: TableColumn<CTSchema, CTName, CName, Col>;
   readonly right: TRight;
   constructor(field: TableColumn<CTSchema, CTName, CName, Col>, right: TRight);
-  toSQL(): string;
   toQuery(query: Query): void;
 }
 declare class NotEqualColCondition<C1TSchema extends string, C1TName extends string, C1Name extends Key, C1 extends AnyColumn, C2TSchema extends string, C2TName extends string, C2Name extends Key, C2 extends AnyColumn> {
   readonly left: TableColumn<C1TSchema, C1TName, C1Name, C1>;
   readonly right: TableColumn<C2TSchema, C2TName, C2Name, C2>;
   constructor(field: TableColumn<C1TSchema, C1TName, C1Name, C1>, right: TableColumn<C2TSchema, C2TName, C2Name, C2>);
-  toSQL(): string;
   toQuery(query: Query): void;
 }
 declare function ne<CTSchema extends string, CTName extends string, CName extends Key, Col extends AnyColumn, TRight extends Col["ValType"]>(field: TableColumn<CTSchema, CTName, CName, Col>, right: TRight): NotEqualValCondition<CTSchema, CTName, CName, Col, TRight>;
@@ -51,14 +47,12 @@ declare class GreaterEqualValCondition<CTSchema extends string, CTName extends s
   readonly left: TableColumn<CTSchema, CTName, CName, Col>;
   readonly right: TRight;
   constructor(field: TableColumn<CTSchema, CTName, CName, Col>, right: TRight);
-  toSQL(): string;
   toQuery(query: Query): void;
 }
 declare class GreaterEqualColCondition<C1TSchema extends string, C1TName extends string, C1Name extends Key, C1 extends AnyColumn, C2TSchema extends string, C2TName extends string, C2Name extends Key, C2 extends AnyColumn> {
   readonly left: TableColumn<C1TSchema, C1TName, C1Name, C1>;
   readonly right: TableColumn<C2TSchema, C2TName, C2Name, C2>;
   constructor(field: TableColumn<C1TSchema, C1TName, C1Name, C1>, right: TableColumn<C2TSchema, C2TName, C2Name, C2>);
-  toSQL(): string;
   toQuery(query: Query): void;
 }
 declare function gte<CTSchema extends string, CTName extends string, CName extends Key, Col extends AnyColumn, TRight extends Col["ValType"]>(field: TableColumn<CTSchema, CTName, CName, Col>, right: TRight): GreaterEqualValCondition<CTSchema, CTName, CName, Col, TRight>;
@@ -68,14 +62,12 @@ declare class GreaterThanValCondition<CTSchema extends string, CTName extends st
   readonly left: TableColumn<CTSchema, CTName, CName, Col>;
   readonly right: TRight;
   constructor(field: TableColumn<CTSchema, CTName, CName, Col>, right: TRight);
-  toSQL(): string;
   toQuery(query: Query): void;
 }
 declare class GreaterThanColCondition<C1TSchema extends string, C1TName extends string, C1Name extends Key, C1 extends AnyColumn, C2TSchema extends string, C2TName extends string, C2Name extends Key, C2 extends AnyColumn> {
   readonly left: TableColumn<C1TSchema, C1TName, C1Name, C1>;
   readonly right: TableColumn<C2TSchema, C2TName, C2Name, C2>;
   constructor(field: TableColumn<C1TSchema, C1TName, C1Name, C1>, right: TableColumn<C2TSchema, C2TName, C2Name, C2>);
-  toSQL(): string;
   toQuery(query: Query): void;
 }
 declare function gt<CTSchema extends string, CTName extends string, CName extends Key, Col extends AnyColumn, TRight extends Col["ValType"]>(field: TableColumn<CTSchema, CTName, CName, Col>, right: TRight): GreaterThanValCondition<CTSchema, CTName, CName, Col, TRight>;
@@ -85,14 +77,12 @@ declare class LessEqualValCondition<CTSchema extends string, CTName extends stri
   readonly left: TableColumn<CTSchema, CTName, CName, Col>;
   readonly right: TRight;
   constructor(field: TableColumn<CTSchema, CTName, CName, Col>, right: TRight);
-  toSQL(): string;
   toQuery(query: Query): void;
 }
 declare class LessEqualColCondition<C1TSchema extends string, C1TName extends string, C1Name extends Key, C1 extends AnyColumn, C2TSchema extends string, C2TName extends string, C2Name extends Key, C2 extends AnyColumn> {
   readonly left: TableColumn<C1TSchema, C1TName, C1Name, C1>;
   readonly right: TableColumn<C2TSchema, C2TName, C2Name, C2>;
   constructor(field: TableColumn<C1TSchema, C1TName, C1Name, C1>, right: TableColumn<C2TSchema, C2TName, C2Name, C2>);
-  toSQL(): string;
   toQuery(query: Query): void;
 }
 declare function lte<CTSchema extends string, CTName extends string, CName extends Key, Col extends AnyColumn, TRight extends Col["ValType"]>(field: TableColumn<CTSchema, CTName, CName, Col>, right: TRight): LessEqualValCondition<CTSchema, CTName, CName, Col, TRight>;
@@ -102,14 +92,12 @@ declare class LessThanValCondition<CTSchema extends string, CTName extends strin
   readonly left: TableColumn<CTSchema, CTName, CName, Col>;
   readonly right: TRight;
   constructor(field: TableColumn<CTSchema, CTName, CName, Col>, right: TRight);
-  toSQL(): string;
   toQuery(query: Query): void;
 }
 declare class LessThanColCondition<C1TSchema extends string, C1TName extends string, C1Name extends Key, C1 extends AnyColumn, C2TSchema extends string, C2TName extends string, C2Name extends Key, C2 extends AnyColumn> {
   readonly left: TableColumn<C1TSchema, C1TName, C1Name, C1>;
   readonly right: TableColumn<C2TSchema, C2TName, C2Name, C2>;
   constructor(field: TableColumn<C1TSchema, C1TName, C1Name, C1>, right: TableColumn<C2TSchema, C2TName, C2Name, C2>);
-  toSQL(): string;
   toQuery(query: Query): void;
 }
 declare function lt<CTSchema extends string, CTName extends string, CName extends Key, Col extends AnyColumn, TRight extends Col["ValType"]>(field: TableColumn<CTSchema, CTName, CName, Col>, right: TRight): LessThanValCondition<CTSchema, CTName, CName, Col, TRight>;
@@ -118,14 +106,12 @@ declare function lt<C1TSchema extends string, C1TName extends string, C1Name ext
 declare class IsNullCondition<CTSchema extends string, CTName extends string, CName extends Key, Col extends AnyColumn> {
   readonly field: TableColumn<CTSchema, CTName, CName, Col>;
   constructor(field: TableColumn<CTSchema, CTName, CName, Col>);
-  toSQL(): string;
   toQuery(query: Query): void;
 }
 declare function isNull<CTSchema extends string, CTName extends string, CName extends Key, Col extends AnyColumn>(field: TableColumn<CTSchema, CTName, CName, Col>): IsNullCondition<CTSchema, CTName, CName, Col>;
 declare class IsNotNullCondition<CTSchema extends string, CTName extends string, CName extends Key, Col extends AnyColumn> {
   readonly field: TableColumn<CTSchema, CTName, CName, Col>;
   constructor(field: TableColumn<CTSchema, CTName, CName, Col>);
-  toSQL(): string;
   toQuery(query: Query): void;
 }
 declare function isNotNull<CTSchema extends string, CTName extends string, CName extends Key, Col extends AnyColumn>(field: TableColumn<CTSchema, CTName, CName, Col>): IsNotNullCondition<CTSchema, CTName, CName, Col>;
@@ -134,21 +120,18 @@ declare class InCondition<CTSchema extends string, CTName extends string, CName
   readonly field: TableColumn<CTSchema, CTName, CName, Col>;
   readonly values: Col["ValType"][] | InSelectQuery<TArg, Col["ValType"]>;
   constructor(field: TableColumn<CTSchema, CTName, CName, Col>, values: Col["ValType"][] | InSelectQuery<TArg, Col["ValType"]>);
-  toSQL(): string;
   toQuery(query: Query): void;
 }
 declare function isIn<CTSchema extends string, CTName extends string, CName extends Key, Col extends AnyColumn>(field: TableColumn<CTSchema, CTName, CName, Col>, values: Col["ValType"][] | InSelectQuery<boolean, Col["ValType"]>): InCondition<CTSchema, CTName, CName, Col, boolean>;
 declare class AndCondition<TConditions extends any[]> {
   readonly conditions: TConditions;
   constructor(...conditions: TConditions);
-  toSQL(): string;
   toQuery(query: Query): void;
 }
 declare function and<TConditions extends any[]>(...conditions: TConditions): AndCondition<TConditions>;
 declare class OrCondition<TConditions extends any[]> {
   readonly conditions: TConditions;
   constructor(...conditions: TConditions);
-  toSQL(): string;
   toQuery(query: Query): void;
 }
 declare function or<TConditions extends any[]>(...conditions: TConditions): OrCondition<TConditions>;

package/dist/src/filters/index.mjs

@@ -9,9 +9,6 @@ var EqualValCondition = class {
 		this.left = field;
 		this.right = right;
 	}
-	toSQL() {
-		return `${this.left.fullName} = ${this.left.toSQL(this.right)}`;
-	}
 	toQuery(query) {
 		query.sql += `${this.left.fullName} = `;
 		if (is(this.right, Arg)) query.addArg(this.right);
@@ -25,9 +22,6 @@ var EqualColCondition = class {
 		this.left = field;
 		this.right = right;
 	}
-	toSQL() {
-		return `${this.left.fullName} = ${this.right.fullName}`;
-	}
 	toQuery(query) {
 		query.sql += `${this.left.fullName} = ${this.right.fullName}`;
 	}
@@ -43,9 +37,6 @@ var NotEqualValCondition = class {
 		this.left = field;
 		this.right = right;
 	}
-	toSQL() {
-		return `${this.left.fullName} != ${this.left.toSQL(this.right)}`;
-	}
 	toQuery(query) {
 		query.sql += `${this.left.fullName} != `;
 		if (is(this.right, Arg)) query.addArg(this.right);
@@ -59,9 +50,6 @@ var NotEqualColCondition = class {
 		this.left = field;
 		this.right = right;
 	}
-	toSQL() {
-		return `${this.left.fullName} != ${this.right.fullName}`;
-	}
 	toQuery(query) {
 		query.sql += `${this.left.fullName} != ${this.right.fullName}`;
 	}
@@ -77,9 +65,6 @@ var GreaterEqualValCondition = class {
 		this.left = field;
 		this.right = right;
 	}
-	toSQL() {
-		return `${this.left.fullName} >= ${this.left.toSQL(this.right)}`;
-	}
 	toQuery(query) {
 		query.sql += `${this.left.fullName} >= `;
 		if (is(this.right, Arg)) query.addArg(this.right);
@@ -93,9 +78,6 @@ var GreaterEqualColCondition = class {
 		this.left = field;
 		this.right = right;
 	}
-	toSQL() {
-		return `${this.left.fullName} >= ${this.right.fullName}`;
-	}
 	toQuery(query) {
 		query.sql += `${this.left.fullName} >= ${this.right.fullName}`;
 	}
@@ -111,9 +93,6 @@ var GreaterThanValCondition = class {
 		this.left = field;
 		this.right = right;
 	}
-	toSQL() {
-		return `${this.left.fullName} > ${this.left.toSQL(this.right)}`;
-	}
 	toQuery(query) {
 		query.sql += `${this.left.fullName} > `;
 		if (is(this.right, Arg)) query.addArg(this.right);
@@ -127,9 +106,6 @@ var GreaterThanColCondition = class {
 		this.left = field;
 		this.right = right;
 	}
-	toSQL() {
-		return `${this.left.fullName} > ${this.right.fullName}`;
-	}
 	toQuery(query) {
 		query.sql += `${this.left.fullName} > ${this.right.fullName}`;
 	}
@@ -145,9 +121,6 @@ var LessEqualValCondition = class {
 		this.left = field;
 		this.right = right;
 	}
-	toSQL() {
-		return `${this.left.fullName} <= ${this.left.toSQL(this.right)}`;
-	}
 	toQuery(query) {
 		query.sql += `${this.left.fullName} <= `;
 		if (is(this.right, Arg)) query.addArg(this.right);
@@ -161,9 +134,6 @@ var LessEqualColCondition = class {
 		this.left = field;
 		this.right = right;
 	}
-	toSQL() {
-		return `${this.left.fullName} <= ${this.right.fullName}`;
-	}
 	toQuery(query) {
 		query.sql += `${this.left.fullName} <= ${this.right.fullName}`;
 	}
@@ -179,9 +149,6 @@ var LessThanValCondition = class {
 		this.left = field;
 		this.right = right;
 	}
-	toSQL() {
-		return `${this.left.fullName} < ${this.left.toSQL(this.right)}`;
-	}
 	toQuery(query) {
 		query.sql += `${this.left.fullName} < `;
 		if (is(this.right, Arg)) query.addArg(this.right);
@@ -195,9 +162,6 @@ var LessThanColCondition = class {
 		this.left = field;
 		this.right = right;
 	}
-	toSQL() {
-		return `${this.left.fullName} < ${this.right.fullName}`;
-	}
 	toQuery(query) {
 		query.sql += `${this.left.fullName} < ${this.right.fullName}`;
 	}
@@ -211,9 +175,6 @@ var IsNullCondition = class {
 	constructor(field) {
 		this.field = field;
 	}
-	toSQL() {
-		return `${this.field.fullName} IS NULL`;
-	}
 	toQuery(query) {
 		query.sql += `${this.field.fullName} IS NULL`;
 	}
@@ -226,9 +187,6 @@ var IsNotNullCondition = class {
 	constructor(field) {
 		this.field = field;
 	}
-	toSQL() {
-		return `${this.field.fullName} IS NOT NULL`;
-	}
 	toQuery(query) {
 		query.sql += `${this.field.fullName} IS NOT NULL`;
 	}
@@ -243,12 +201,6 @@ var InCondition = class {
 		this.field = field;
 		this.values = values;
 	}
-	toSQL() {
-		if (Array.isArray(this.values)) {
-			if (this.values.length === 0) return "FALSE";
-			return `${this.field.fullName} IN (${this.values.map((v) => this.field.toSQL(v)).join(", ")})`;
-		} else return `${this.field.fullName} IN (${this.values.toQuery()})`;
-	}
 	toQuery(query) {
 		if (Array.isArray(this.values)) {
 			if (this.values.length === 0) {
@@ -273,14 +225,6 @@ var AndCondition = class {
 	constructor(...conditions) {
 		this.conditions = conditions;
 	}
-	toSQL() {
-		let sql = "";
-		for (let i = 0; i < this.conditions.length; i++) {
-			sql += this.conditions[i].toSQL();
-			if (i < this.conditions.length - 1) sql += " AND ";
-		}
-		return sql;
-	}
 	toQuery(query) {
 		for (let i = 0; i < this.conditions.length; i++) {
 			this.conditions[i].toQuery(query);
@@ -296,14 +240,6 @@ var OrCondition = class {
 	constructor(...conditions) {
 		this.conditions = conditions;
 	}
-	toSQL() {
-		let sql = "";
-		for (let i = 0; i < this.conditions.length; i++) {
-			sql += this.conditions[i].toSQL();
-			if (i < this.conditions.length - 1) sql += " OR ";
-		}
-		return sql;
-	}
 	toQuery(query) {
 		for (let i = 0; i < this.conditions.length; i++) {
 			this.conditions[i].toQuery(query);

package/dist/src/query-builders/aggregates.mjs

@@ -23,8 +23,7 @@ var AggregateQuery = class extends QueryPromise {
 		query.sql += this.#$table._.fullName;
 		if (this.#$where) {
 			query.sql += " WHERE ";
-			if (this.#$prepare) this.#$where.toQuery(query);
-			else query.sql += this.#$where.toSQL();
+			this.#$where.toQuery(query);
 		}
 		return query;
 	}

package/dist/src/query-builders/count.mjs

@@ -18,8 +18,7 @@ var CountQuery = class extends QueryPromise {
 		query.sql += this.#$table._.fullName;
 		if (this.#$where) {
 			query.sql += " WHERE ";
-			if (this.#$prepare) this.#$where.toQuery(query);
-			else query.sql += this.#$where.toSQL();
+			this.#$where.toQuery(query);
 		}
 		return query;
 	}

package/dist/src/query-builders/delete.mjs

@@ -26,8 +26,7 @@ var DeleteQuery = class DeleteQuery extends QueryPromise {
 		query.sql += this.#$table._.fullName;
 		if (this.#$where) {
 			query.sql += " WHERE ";
-			if (this.#$prepare) this.#$where.toQuery(query);
-			else query.sql += this.#$where.toSQL();
+			this.#$where.toQuery(query);
 		}
 		if (this.#$returning) {
 			query.sql += " RETURNING ";

package/dist/src/query-builders/distinct.mjs

@@ -21,8 +21,7 @@ var DistinctQuery = class extends QueryPromise {
 		query.sql += this.#$table._.fullName;
 		if (this.#$where) {
 			query.sql += " WHERE ";
-			if (this.#$prepare) this.#$where.toQuery(query);
-			else query.sql += this.#$where.toSQL();
+			this.#$where.toQuery(query);
 		}
 		query.sql += ` ORDER BY ${columnName}`;
 		return query;

package/dist/src/query-builders/exists.mjs

@@ -18,8 +18,7 @@ var ExistsQuery = class extends QueryPromise {
 		query.sql += this.#$table._.fullName;
 		if (this.#$where) {
 			query.sql += " WHERE ";
-			if (this.#$prepare) this.#$where.toQuery(query);
-			else query.sql += this.#$where.toSQL();
+			this.#$where.toQuery(query);
 		}
 		query.sql += ")";
 		return query;

package/dist/src/query-builders/first.mjs

@@ -19,8 +19,7 @@ var FirstQuery = class extends QueryPromise {
 		query.sql += this.#$table._.fullName;
 		if (this.#$where) {
 			query.sql += " WHERE ";
-			if (this.#$prepare) this.#$where.toQuery(query);
-			else query.sql += this.#$where.toSQL();
+			this.#$where.toQuery(query);
 		}
 		query.sql += " LIMIT 1";
 		return query;

package/dist/src/query-builders/rq.mjs

@@ -64,7 +64,10 @@ var RelationQuery = class extends QueryPromise {
 				if (relation) query.sql += buildRelationSubquery(key, this.#table._.name, o, relation, this.#allRelations);
 			}
 		}
-		if (options.where) query.sql += ` WHERE ${options.where.toSQL()}`;
+		if (options.where) {
+			query.sql += " WHERE ";
+			options.where.toQuery(query);
+		}
 		if (options.orderBy) {
 			const orders = Array.isArray(options.orderBy) ? options.orderBy : [options.orderBy];
 			query.sql += ` ORDER BY ${orders.map((o) => o.toSQL()).join(", ")}`;

package/dist/src/query-builders/select.mjs

@@ -75,12 +75,12 @@ var SelectQuery = class SelectQuery extends QueryPromise {
 		query.sql += this.#table._.fullName;
 		this.#$innerJoins?.forEach((innerJoin) => {
 			const join = innerJoin;
-			query.sql += ` INNER JOIN ${join.table._.fullName} ON ${join.on.toSQL()}`;
+			query.sql += ` INNER JOIN ${join.table._.fullName} ON `;
+			join.on.toQuery(query);
 		});
 		if (this.#$where) {
 			query.sql += " WHERE ";
-			if (this.#prepare) this.#$where.toQuery(query);
-			else query.sql += this.#$where.toSQL();
+			this.#$where.toQuery(query);
 		}
 		if (this.#$orderBy) {
 			const orders = Array.isArray(this.#$orderBy) ? this.#$orderBy : [this.#$orderBy];

package/dist/src/query-builders/update.mjs

@@ -58,8 +58,7 @@ var UpdateQuery = class UpdateQuery extends QueryPromise {
 		query.sql += allFields.map((field, index) => `"${this.#table._.columns[field].nameSnake}" = ${this.#table._.columns[field].toSQL(allValues[index], { cast: true })}`).join(", ");
 		if (this.#$where) {
 			query.sql += ` WHERE `;
-			if (this.#prepare) this.#$where.toQuery(query);
-			else query.sql += this.#$where.toSQL();
+			this.#$where.toQuery(query);
 		}
 		if (this.#$returning) {
 			query.sql += " RETURNING ";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "durcno",
-  "version": "1.0.0-alpha.5",
+  "version": "1.0.0-alpha.6",
   "description": "A PostgreSQL Query Builder and Migration Manager for TypeScript, from the future.",
   "license": "Apache-2.0",
   "homepage": "https://durcno.dev",