@atscript/db-postgres 0.1.146 → 0.1.147

package/dist/index.cjs

@@ -79,6 +79,8 @@ const pgDialect = {
 	},
 	calendarBucket: pgCalendarBucket,
 	jsonExtract: pgJsonExtract,
+	castDouble: (expr) => `CAST(${expr} AS DOUBLE PRECISION)`,
+	nullsSortLargest: true,
 	createViewPrefix: "CREATE OR REPLACE VIEW",
 	paramPlaceholder(index) {
 		return `$${index}`;
@@ -105,33 +107,47 @@ function pgJsonExtract(quotedCol, path, type) {
 /**
 * Calendar-bucket label over an epoch-ms column (BIGINT for
 * `@db.default.now`, DOUBLE PRECISION otherwise): TEXT `'YYYY-MM-DD'` — the
-* local date of the bucket's first day in `b.tz` — or NULL for a NULL source
-* or one outside `[BUCKET_MIN_INSTANT, BUCKET_MAX_INSTANT)`.
+* local date of the bucket's first day in `b.tz` — or, for `hour`,
+* `'YYYY-MM-DDTHH:00'` — the local wall-clock hour — or NULL for a NULL
+* source or one outside `[BUCKET_MIN_INSTANT, BUCKET_MAX_INSTANT)`.
 *
-* The local date is `(to_timestamp(col / 1000) AT TIME ZONE '<tz>')::date`:
-* `timestamptz AT TIME ZONE` yields the wall time in that zone, independent
-* of the session `TimeZone`. Truncation is calendar arithmetic on that date —
-* the week uses the generic `(isodow - weekStart + 7) % 7` formula
-* (`date_trunc('week')` is Monday-only). `date_trunc` and `to_char` get an
-* explicit `::timestamp`: a bare `date` resolves to their `timestamptz`
-* overloads, which would route through the session zone.
+* The wall time is `to_timestamp(col / 1000) AT TIME ZONE '<tz>'`:
+* `timestamptz AT TIME ZONE` yields the (zone-less) wall time in that zone,
+* independent of the session `TimeZone` — so a `+05:30` zone's hour starts at
+* :30 UTC and a DST fall-back's repeated hour is one label. The hour is
+* formatted from it; the other units truncate its `::date` with calendar
+* arithmetic — the week uses the generic `(isodow - weekStart + 7) % 7`
+* formula (`date_trunc('week')` is Monday-only). `date_trunc` and `to_char`
+* get an explicit `::timestamp`: a bare `date` resolves to their
+* `timestamptz` overloads, which would route through the session zone.
 *
 * Parameter-free (the zone is an inlined, charset-checked literal), so the
 * SELECT and GROUP BY renderings match structurally.
 */
 function pgCalendarBucket(quotedCol, b) {
-	const local = `(to_timestamp(${quotedCol}::double precision / 1000) AT TIME ZONE ${(0, _atscript_db_sql_tools.sqlTimeZoneLiteral)(b.tz)})::date`;
-	let first;
+	const wall = `(to_timestamp(${quotedCol}::double precision / 1000) AT TIME ZONE ${(0, _atscript_db_sql_tools.sqlTimeZoneLiteral)(b.tz)})`;
+	const local = `${wall}::date`;
+	let value;
+	let format = "YYYY-MM-DD";
 	switch (b.unit) {
+		case "hour":
+			value = wall;
+			format = "YYYY-MM-DD\"T\"HH24\":00\"";
+			break;
 		case "day":
-			first = local;
+			value = local;
 			break;
 		case "week":
-			first = `(${local} - ((EXTRACT(ISODOW FROM ${local})::int - ${b.weekStartIso} + 7) % 7))`;
+			value = `(${local} - ((EXTRACT(ISODOW FROM ${local})::int - ${b.weekStartIso} + 7) % 7))`;
+			break;
+		case "month":
+		case "quarter":
+		case "year":
+			value = `date_trunc('${b.unit}', ${local}::timestamp)`;
 			break;
-		default: first = `date_trunc('${b.unit}', ${local}::timestamp)`;
+		default: throw new Error(`Unhandled calendar bucket unit "${String(b.unit)}"`);
 	}
-	return `CASE WHEN ${quotedCol} >= ${_uniqu_core.BUCKET_MIN_INSTANT} AND ${quotedCol} < ${_uniqu_core.BUCKET_MAX_INSTANT} THEN ${`to_char(${first}::timestamp, 'YYYY-MM-DD')`} END`;
+	return `CASE WHEN ${quotedCol} >= ${_uniqu_core.BUCKET_MIN_INSTANT} AND ${quotedCol} < ${_uniqu_core.BUCKET_MAX_INSTANT} THEN ${`to_char(${value}::timestamp, '${format}')`} END`;
 }
 /**
 * Distance-in-meters expression from a geography column to a query point.
@@ -321,12 +337,7 @@ function buildCreateTable(table, fields, foreignKeys, options) {
 	}
 	if (foreignKeys) for (const fk of foreignKeys.values()) {
 		if (options?.deferForeignKeysTo?.has(fk.targetTable)) continue;
-		const localCols = fk.fields.map((f) => qi(f)).join(", ");
-		const targetCols = fk.targetFields.map((f) => qi(f)).join(", ");
-		let constraint = `FOREIGN KEY (${localCols}) REFERENCES ${qi(fk.targetTable)} (${targetCols})`;
-		if (fk.onDelete) constraint += ` ON DELETE ${(0, _atscript_db_sql_tools.refActionToSql)(fk.onDelete)}`;
-		if (fk.onUpdate) constraint += ` ON UPDATE ${(0, _atscript_db_sql_tools.refActionToSql)(fk.onUpdate)}`;
-		colDefs.push(constraint);
+		colDefs.push((0, _atscript_db_sql_tools.foreignKeySql)(qi, fk));
 	}
 	return `CREATE TABLE IF NOT EXISTS ${quoteTableName(table)} (${colDefs.join(", ")})`;
 }
@@ -341,9 +352,15 @@ function buildCreateTable(table, fields, foreignKeys, options) {
 *
 * Case-insensitive columns (`@db.collate 'nocase'`) are handled by CITEXT
 * column type at the storage level — no query-side wrapping needed.
+*
+* Relational predicates (`$some` / `$none`) render as correlated `EXISTS`
+* subqueries referencing the outer table by `opts.qualifier` (default: the
+* source table) — a statement with an aliased FROM must pass its alias.
+*
+* @param opts - since 0.1.147
 */
-function buildWhere(filter) {
-	return (0, _atscript_db_sql_tools.buildWhere)(pgDialect, filter);
+function buildWhere(filter, opts) {
+	return (0, _atscript_db_sql_tools.buildWhere)(pgDialect, filter, opts);
 }
 //#endregion
 //#region src/postgres-adapter.ts
@@ -426,7 +443,7 @@ var PostgresAdapter = class PostgresAdapter extends _atscript_db.BaseDbAdapter {
 	_vectorThresholds = /* @__PURE__ */ new Map();
 	/**
 	* Schema name for catalog queries and qualification — `@db.schema` of the
-	* bound table, or `null` (→ `'public'`, the same default the bound path
+	* bound table, or `null` (→ the connection's `current_schema()`, the same default the bound path
 	* uses) when the table declares none or the adapter is an administrative
 	* one with no readable (the name-taking schema-sync primitives run on such
 	* an adapter).
@@ -482,6 +499,15 @@ var PostgresAdapter = class PostgresAdapter extends _atscript_db.BaseDbAdapter {
 	_exec() {
 		return this._txConnection() ?? this.driver;
 	}
+	/**
+	* Relational predicates (`$some` / `$none`) render as correlated
+	* `[NOT] EXISTS` subqueries — in reads and in mutation filters alike.
+	*
+	* @since 0.1.147
+	*/
+	supportsRelationFilters(_mode) {
+		return true;
+	}
 	/** PostgreSQL enforces FK constraints natively. */
 	supportsNativeForeignKeys() {
 		return true;
@@ -506,6 +532,10 @@ var PostgresAdapter = class PostgresAdapter extends _atscript_db.BaseDbAdapter {
 	aggregateFns() {
 		return _atscript_db.ALL_AGGREGATE_FNS;
 	}
+	/** Computed view columns and first-row joins. */
+	viewCapabilities() {
+		return _atscript_db.ALL_VIEW_CAPABILITIES;
+	}
 	onBeforeFlatten(_type) {}
 	onAfterFlatten() {
 		for (const fd of this._table.fieldDescriptors) if (fd.collate === "nocase") this._nocaseColumns.add(fd.physicalName);
@@ -608,7 +638,7 @@ var PostgresAdapter = class PostgresAdapter extends _atscript_db.BaseDbAdapter {
 	}
 	async insertOne(data) {
 		let { sql, params } = buildInsert(this.resolveTableName(), data);
-		const pkCols = this._table.primaryKeys.map((pk) => qi(pk));
+		const pkCols = this._pkColumns().map((pk) => qi(pk));
 		if (pkCols.length > 0) sql += ` RETURNING ${pkCols.join(", ")}`;
 		this._log(sql, params);
 		const returned = (await this._wrapConstraintError(() => this._exec().run(sql, params))).rows?.[0];
@@ -621,7 +651,7 @@ var PostgresAdapter = class PostgresAdapter extends _atscript_db.BaseDbAdapter {
 		};
 		return this.withTransaction(async () => {
 			const tableName = this.resolveTableName();
-			const pkCols = this._table.primaryKeys;
+			const pkCols = this._pkColumns();
 			const returningSuffix = pkCols.length > 0 ? ` RETURNING ${pkCols.map((pk) => qi(pk)).join(", ")}` : "";
 			const columns = (0, _atscript_db_sql_tools.insertManyColumns)(data);
 			const maxRowsPerBatch = columns.length > 0 ? Math.floor(6e4 / columns.length) : data.length;
@@ -660,6 +690,16 @@ var PostgresAdapter = class PostgresAdapter extends _atscript_db.BaseDbAdapter {
 		this._log(sql, params);
 		return this._exec().all(sql, params);
 	}
+	/**
+	* `$skip` / `$limit` per partition in one statement: a `ROW_NUMBER()`
+	* window over `partitionBy` (the generic `$with` loader's per-parent page).
+	*/
+	async findManyPerPartition(query, partitionBy) {
+		const where = buildWhere(query.filter);
+		const { sql, params } = (0, _atscript_db_sql_tools.buildPartitionedSelect)(pgDialect, this.resolveTableName(), where, query.controls, partitionBy);
+		this._log(sql, params);
+		return (0, _atscript_db_sql_tools.stripPartitionRowNumber)(await this._exec().all(sql, params));
+	}
 	async count(query) {
 		const where = buildWhere(query.filter);
 		const { sql, params } = (0, _atscript_db_sql_tools.finalizeParams)(pgDialect, {
@@ -699,6 +739,10 @@ var PostgresAdapter = class PostgresAdapter extends _atscript_db.BaseDbAdapter {
 			throw error;
 		}
 	}
+	/** Physical primary-key columns (`@db.column` renames applied). */
+	_pkColumns() {
+		return this._table.primaryKeys.map((key) => this._table.physicalPath(key));
+	}
 	/**
 	* The predicate that narrows a single-row UPDATE/DELETE to the first row
 	* matching `whereSql`: `<key> <op> (SELECT <cols> … LIMIT 1)`. Single-col
@@ -708,7 +752,7 @@ var PostgresAdapter = class PostgresAdapter extends _atscript_db.BaseDbAdapter {
 	* existing behavior rather than guess.
 	*/
 	_limitOnePredicate(quotedTable, whereSql) {
-		const pkCols = this._table.primaryKeys;
+		const pkCols = this._pkColumns();
 		const quotedKeys = pkCols.length > 0 ? pkCols.map((c) => qi(c)) : ["ctid"];
 		const colList = quotedKeys.join(", ");
 		return `${quotedKeys.length === 1 ? `${colList} =` : `(${colList}) IN`} (SELECT ${colList} FROM ${quotedTable} WHERE ${whereSql} LIMIT 1)`;
@@ -818,7 +862,7 @@ var PostgresAdapter = class PostgresAdapter extends _atscript_db.BaseDbAdapter {
        JOIN pg_class cl ON cl.oid = c.conrelid
        JOIN pg_class rcl ON rcl.oid = c.confrelid
        JOIN pg_namespace rn ON rn.oid = rcl.relnamespace
-       WHERE c.contype = 'f' AND rcl.relname = $1 AND rn.nspname = COALESCE($2, 'public')
+       WHERE c.contype = 'f' AND rcl.relname = $1 AND rn.nspname = COALESCE($2, current_schema())
        ORDER BY cl.relname, c.conname`, [tableName, this._schema])).map((r) => ({
 			table: r.table_name,
 			fields: r.columns ?? [],
@@ -828,7 +872,7 @@ var PostgresAdapter = class PostgresAdapter extends _atscript_db.BaseDbAdapter {
 	async getObjectKind(name) {
 		switch ((await this._exec().get(`SELECT c.relkind FROM pg_class c
        JOIN pg_namespace n ON n.oid = c.relnamespace
-       WHERE c.relname = $1 AND n.nspname = COALESCE($2, 'public')
+       WHERE c.relname = $1 AND n.nspname = COALESCE($2, current_schema())
          AND c.relkind IN ('r', 'p', 'v', 'm')`, [name, this._schema]))?.relkind) {
 			case "r":
 			case "p": return "table";
@@ -856,7 +900,7 @@ var PostgresAdapter = class PostgresAdapter extends _atscript_db.BaseDbAdapter {
 			const row = await this._exec().get(`SELECT c.conname FROM pg_constraint c
          JOIN pg_class cl ON cl.oid = c.conrelid
          JOIN pg_namespace n ON n.oid = cl.relnamespace
-         WHERE c.contype = 'p' AND cl.relname = $1 AND n.nspname = COALESCE($2, 'public')`, [this._table.tableName, this._schema]);
+         WHERE c.contype = 'p' AND cl.relname = $1 AND n.nspname = COALESCE($2, current_schema())`, [this._table.tableName, this._schema]);
 			if (row?.conname) clauses.push(`DROP CONSTRAINT ${qi(row.conname)}`);
 		}
 		if (change.to.length > 0) clauses.push(`ADD PRIMARY KEY (${change.to.map((c) => qi(c)).join(", ")})`);
@@ -888,8 +932,8 @@ var PostgresAdapter = class PostgresAdapter extends _atscript_db.BaseDbAdapter {
               ) AS is_pk
        FROM information_schema.columns c
        JOIN pg_attribute a ON a.attname = c.column_name
-         AND a.attrelid = (SELECT oid FROM pg_class WHERE relname = $1 AND relnamespace = (SELECT oid FROM pg_namespace WHERE nspname = COALESCE($2, 'public')))
-       WHERE c.table_name = $1 AND c.table_schema = COALESCE($2, 'public')
+         AND a.attrelid = (SELECT oid FROM pg_class WHERE relname = $1 AND relnamespace = (SELECT oid FROM pg_namespace WHERE nspname = COALESCE($2, current_schema())))
+       WHERE c.table_name = $1 AND c.table_schema = COALESCE($2, current_schema())
        ORDER BY c.ordinal_position`, [tableName, schema])).map((r) => {
 			const column = {
 				name: r.column_name,
@@ -1009,10 +1053,10 @@ var PostgresAdapter = class PostgresAdapter extends _atscript_db.BaseDbAdapter {
          CROSS JOIN LATERAL unnest(c.conkey, c.confkey) WITH ORDINALITY AS k(attnum, refattnum, ord)
          JOIN pg_attribute a ON a.attrelid = c.conrelid AND a.attnum = k.attnum
          JOIN pg_attribute ra ON ra.attrelid = c.confrelid AND ra.attnum = k.refattnum
-         WHERE c.contype = 'f' AND rcl.relname = $2 AND rn.nspname = COALESCE($1, 'public')
+         WHERE c.contype = 'f' AND rcl.relname = $2 AND rn.nspname = COALESCE($1, current_schema())
          ORDER BY n.nspname, cl.relname, c.conname, k.ord`, [schema, this._table.tableName]);
 			const inboundFks = /* @__PURE__ */ new Map();
-			const ownSchema = schema ?? "public";
+			const ownSchema = schema ?? (await conn.get("SELECT current_schema() AS s"))?.s ?? "public";
 			for (const fk of fkRefs) {
 				if (fk.table_schema === ownSchema && fk.table_name === this._table.tableName) continue;
 				const key = `${fk.table_schema}.${fk.table_name}.${fk.constraint_name}`;
@@ -1107,7 +1151,7 @@ var PostgresAdapter = class PostgresAdapter extends _atscript_db.BaseDbAdapter {
        FROM pg_constraint c
        JOIN pg_class cl ON cl.oid = c.conrelid
        JOIN pg_namespace n ON n.oid = cl.relnamespace
-       WHERE cl.relname = $1 AND n.nspname = COALESCE($2, 'public')
+       WHERE cl.relname = $1 AND n.nspname = COALESCE($2, current_schema())
        ORDER BY c.conname`, [table, this._schema]);
 		const taken = new Set(rows.map((r) => r.conname));
 		for (const { conname, contype, columns } of rows) {
@@ -1131,7 +1175,7 @@ var PostgresAdapter = class PostgresAdapter extends _atscript_db.BaseDbAdapter {
 	async _relationExists(conn, name) {
 		return (await conn.get(`SELECT true AS present FROM pg_class c
        JOIN pg_namespace n ON n.oid = c.relnamespace
-       WHERE c.relname = $1 AND n.nspname = COALESCE($2, 'public')`, [name, this._schema]))?.present ?? false;
+       WHERE c.relname = $1 AND n.nspname = COALESCE($2, current_schema())`, [name, this._schema]))?.present ?? false;
 	}
 	async afterSyncTable() {
 		await this._resetIdentitySequences();
@@ -1154,7 +1198,7 @@ var PostgresAdapter = class PostgresAdapter extends _atscript_db.BaseDbAdapter {
 		}
 	}
 	async tableExists() {
-		return (await this._exec().get(`SELECT EXISTS (SELECT 1 FROM information_schema.tables WHERE table_name = $1 AND table_schema = COALESCE($2, 'public')) AS "exists"`, [this._table.tableName, this._schema]))?.exists ?? false;
+		return (await this._exec().get(`SELECT EXISTS (SELECT 1 FROM information_schema.tables WHERE table_name = $1 AND table_schema = COALESCE($2, current_schema())) AS "exists"`, [this._table.tableName, this._schema]))?.exists ?? false;
 	}
 	/**
 	* No CASCADE: when something outside the sync inventory (a user view, an
@@ -1183,7 +1227,7 @@ var PostgresAdapter = class PostgresAdapter extends _atscript_db.BaseDbAdapter {
        JOIN pg_class i ON i.oid = x.indexrelid
        JOIN pg_namespace n ON n.oid = t.relnamespace
        JOIN pg_attribute a ON a.attrelid = t.oid AND a.attnum = ANY(x.indkey)
-       WHERE t.relname = $1 AND n.nspname = COALESCE($2, 'public')
+       WHERE t.relname = $1 AND n.nspname = COALESCE($2, current_schema())
          AND i.relname LIKE 'atscript__%' AND a.attname = ANY($3)`, [
 			tableName,
 			schema,
@@ -1235,7 +1279,7 @@ var PostgresAdapter = class PostgresAdapter extends _atscript_db.BaseDbAdapter {
            JOIN pg_class t ON t.oid = x.indrelid
            JOIN pg_class i ON i.oid = x.indexrelid
            JOIN pg_namespace n ON n.oid = t.relnamespace
-           WHERE t.relname = $1 AND n.nspname = COALESCE($2, 'public')`, [tableName, schema])).map((r) => ({
+           WHERE t.relname = $1 AND n.nspname = COALESCE($2, current_schema())`, [tableName, schema])).map((r) => ({
 					name: r.name,
 					columns: r.columns ?? void 0
 				}));
@@ -1281,7 +1325,7 @@ var PostgresAdapter = class PostgresAdapter extends _atscript_db.BaseDbAdapter {
 	async syncForeignKeys() {
 		const existingByName = await this._getExistingFkConstraints();
 		const desiredFkKeys = /* @__PURE__ */ new Set();
-		for (const fk of this._table.foreignKeys.values()) desiredFkKeys.add([...fk.fields].toSorted().join(","));
+		for (const fk of this._table.foreignKeys.values()) desiredFkKeys.add([...(0, _atscript_db.fkColumns)(fk).fields].toSorted().join(","));
 		for (const [constraintName, columns] of existingByName) {
 			const key = [...columns].toSorted().join(",");
 			if (!desiredFkKeys.has(key)) {
@@ -1292,13 +1336,9 @@ var PostgresAdapter = class PostgresAdapter extends _atscript_db.BaseDbAdapter {
 		}
 		const existingKeys = new Set([...existingByName.values()].map((cols) => cols.toSorted().join(",")));
 		for (const fk of this._table.foreignKeys.values()) {
-			const key = [...fk.fields].toSorted().join(",");
+			const key = [...(0, _atscript_db.fkColumns)(fk).fields].toSorted().join(",");
 			if (!existingKeys.has(key)) {
-				const localCols = fk.fields.map((f) => qi(f)).join(", ");
-				const targetCols = fk.targetFields.map((f) => qi(f)).join(", ");
-				let ddl = `ALTER TABLE ${quoteTableName(this.resolveTableName())} ADD FOREIGN KEY (${localCols}) REFERENCES ${qi(fk.targetTable)} (${targetCols})`;
-				if (fk.onDelete) ddl += ` ON DELETE ${(0, _atscript_db_sql_tools.refActionToSql)(fk.onDelete)}`;
-				if (fk.onUpdate) ddl += ` ON UPDATE ${(0, _atscript_db_sql_tools.refActionToSql)(fk.onUpdate)}`;
+				const ddl = `ALTER TABLE ${quoteTableName(this.resolveTableName())} ADD ${(0, _atscript_db_sql_tools.foreignKeySql)(qi, fk)}`;
 				this._log(ddl);
 				await this._exec().exec(ddl);
 			}
@@ -1325,7 +1365,7 @@ var PostgresAdapter = class PostgresAdapter extends _atscript_db.BaseDbAdapter {
        JOIN pg_namespace n ON n.oid = cl.relnamespace
        CROSS JOIN LATERAL unnest(c.conkey) WITH ORDINALITY AS k(attnum, ord)
        JOIN pg_attribute a ON a.attrelid = c.conrelid AND a.attnum = k.attnum
-       WHERE c.contype = 'f' AND cl.relname = $1 AND n.nspname = COALESCE($2, 'public')
+       WHERE c.contype = 'f' AND cl.relname = $1 AND n.nspname = COALESCE($2, current_schema())
        ORDER BY c.conname, k.ord`, [this._table.tableName, this._schema]);
 		const byName = /* @__PURE__ */ new Map();
 		for (const row of rows) {
@@ -1470,7 +1510,7 @@ var PostgresAdapter = class PostgresAdapter extends _atscript_db.BaseDbAdapter {
 			vec = first.value[1];
 		}
 		const distanceOp = similarityToPgOp(vec.similarity);
-		const where = buildWhere(query.filter);
+		const where = buildWhere(query.filter, { qualifier: pgDialect.quoteTable(_atscript_db_sql_tools.SEARCH_SOURCE_ALIAS) });
 		const controls = query.controls || {};
 		const threshold = this._resolveVectorThreshold(controls, vec.indexName);
 		return {
@@ -1563,7 +1603,7 @@ var PostgresAdapter = class PostgresAdapter extends _atscript_db.BaseDbAdapter {
 		const controls = query.controls ?? {};
 		return {
 			tableName: this.resolveTableName(),
-			where: buildWhere(query.filter),
+			where: buildWhere(query.filter, { qualifier: pgDialect.quoteTable(_atscript_db_sql_tools.SEARCH_SOURCE_ALIAS) }),
 			dist: pgGeoDistanceExpr(qi(column), point),
 			window: (0, _atscript_db_sql_tools.geoWindowFromControls)(controls),
 			controls

package/dist/index.d.cts

@@ -1,6 +1,6 @@
-import { AggregateFn, BaseDbAdapter, BucketUnit, DbQuery, DbSpace, FilterExpr, TColumnDiff, TDbDefaultFn, TDbDeleteResult, TDbFieldMeta, TDbInsertManyResult, TDbInsertResult, TDbObjectKind, TDbUpdateResult, TEnsureTableOptions, TExistingColumn, TFieldOps, TPrimaryKeyChange, TReferencingForeignKey, TSearchIndexInfo, TSyncColumnResult, TValueFormatterPair } from "@atscript/db";
+import { AggregateFn, BaseDbAdapter, BucketUnit, DbQuery, DbSpace, FilterExpr, TColumnDiff, TDbDefaultFn, TDbDeleteResult, TDbFieldMeta, TDbInsertManyResult, TDbInsertResult, TDbObjectKind, TDbUpdateResult, TEnsureTableOptions, TExistingColumn, TFieldOps, TPrimaryKeyChange, TReferencingForeignKey, TSearchIndexInfo, TSyncColumnResult, TValueFormatterPair, TViewCapability } from "@atscript/db";
 import { TMetadataMap } from "@atscript/typescript/utils";
-import { TSqlFragment } from "@atscript/db-sql-tools";
+import { TFilterVisitorOptions, TSqlFragment } from "@atscript/db-sql-tools";
 
 //#region src/types.d.ts
 /**
@@ -89,7 +89,7 @@ declare class PostgresAdapter extends BaseDbAdapter {
   private _vectorThresholds;
   /**
    * Schema name for catalog queries and qualification — `@db.schema` of the
-   * bound table, or `null` (→ `'public'`, the same default the bound path
+   * bound table, or `null` (→ the connection's `current_schema()`, the same default the bound path
    * uses) when the table declares none or the adapter is an administrative
    * one with no readable (the name-taking schema-sync primitives run on such
    * an adapter).
@@ -108,6 +108,13 @@ declare class PostgresAdapter extends BaseDbAdapter {
    * otherwise the pool-based driver.
    */
   private _exec;
+  /**
+   * Relational predicates (`$some` / `$none`) render as correlated
+   * `[NOT] EXISTS` subqueries — in reads and in mutation filters alike.
+   *
+   * @since 0.1.147
+   */
+  supportsRelationFilters(_mode: "read" | "write"): boolean;
   /** PostgreSQL enforces FK constraints natively. */
   supportsNativeForeignKeys(): boolean;
   prepareId(id: unknown, _fieldType: unknown): unknown;
@@ -120,6 +127,8 @@ declare class PostgresAdapter extends BaseDbAdapter {
   calendarBucketUnits(): ReadonlySet<BucketUnit>;
   /** Every aggregate function, `countDistinct` included. */
   aggregateFns(): ReadonlySet<AggregateFn>;
+  /** Computed view columns and first-row joins. */
+  viewCapabilities(): ReadonlySet<TViewCapability>;
   onBeforeFlatten(_type: unknown): void;
   onAfterFlatten(): void;
   onFieldScanned(field: string, _type: unknown, metadata: TMetadataMap<AtscriptMetadata>): void;
@@ -146,6 +155,11 @@ declare class PostgresAdapter extends BaseDbAdapter {
   insertMany(data: Array<Record<string, unknown>>): Promise<TDbInsertManyResult>;
   findOne(query: DbQuery): Promise<Record<string, unknown> | null>;
   findMany(query: DbQuery): Promise<Array<Record<string, unknown>>>;
+  /**
+   * `$skip` / `$limit` per partition in one statement: a `ROW_NUMBER()`
+   * window over `partitionBy` (the generic `$with` loader's per-parent page).
+   */
+  findManyPerPartition(query: DbQuery, partitionBy: readonly string[]): Promise<Array<Record<string, unknown>>>;
   count(query: DbQuery): Promise<number>;
   aggregate(query: DbQuery): Promise<Array<Record<string, unknown>>>;
   /**
@@ -156,6 +170,8 @@ declare class PostgresAdapter extends BaseDbAdapter {
    * older than the runtime's. Other errors propagate unchanged.
    */
   private _wrapBucketZoneError;
+  /** Physical primary-key columns (`@db.column` renames applied). */
+  private _pkColumns;
   /**
    * The predicate that narrows a single-row UPDATE/DELETE to the first row
    * matching `whereSql`: `<key> <op> (SELECT <cols> … LIMIT 1)`. Single-col
@@ -342,8 +358,14 @@ declare class PgDriver implements TPgDriver {
  *
  * Case-insensitive columns (`@db.collate 'nocase'`) are handled by CITEXT
  * column type at the storage level — no query-side wrapping needed.
+ *
+ * Relational predicates (`$some` / `$none`) render as correlated `EXISTS`
+ * subqueries referencing the outer table by `opts.qualifier` (default: the
+ * source table) — a statement with an aliased FROM must pass its alias.
+ *
+ * @param opts - since 0.1.147
  */
-declare function buildWhere(filter: FilterExpr): TSqlFragment;
+declare function buildWhere(filter: FilterExpr, opts?: TFilterVisitorOptions): TSqlFragment;
 //#endregion
 //#region src/index.d.ts
 /**

package/dist/index.d.mts

@@ -1,5 +1,5 @@
-import { AggregateFn, BaseDbAdapter, BucketUnit, DbQuery, DbSpace, FilterExpr, TColumnDiff, TDbDefaultFn, TDbDeleteResult, TDbFieldMeta, TDbInsertManyResult, TDbInsertResult, TDbObjectKind, TDbUpdateResult, TEnsureTableOptions, TExistingColumn, TFieldOps, TPrimaryKeyChange, TReferencingForeignKey, TSearchIndexInfo, TSyncColumnResult, TValueFormatterPair } from "@atscript/db";
-import { TSqlFragment } from "@atscript/db-sql-tools";
+import { AggregateFn, BaseDbAdapter, BucketUnit, DbQuery, DbSpace, FilterExpr, TColumnDiff, TDbDefaultFn, TDbDeleteResult, TDbFieldMeta, TDbInsertManyResult, TDbInsertResult, TDbObjectKind, TDbUpdateResult, TEnsureTableOptions, TExistingColumn, TFieldOps, TPrimaryKeyChange, TReferencingForeignKey, TSearchIndexInfo, TSyncColumnResult, TValueFormatterPair, TViewCapability } from "@atscript/db";
+import { TFilterVisitorOptions, TSqlFragment } from "@atscript/db-sql-tools";
 import { TMetadataMap } from "@atscript/typescript/utils";
 
 //#region src/types.d.ts
@@ -89,7 +89,7 @@ declare class PostgresAdapter extends BaseDbAdapter {
   private _vectorThresholds;
   /**
    * Schema name for catalog queries and qualification — `@db.schema` of the
-   * bound table, or `null` (→ `'public'`, the same default the bound path
+   * bound table, or `null` (→ the connection's `current_schema()`, the same default the bound path
    * uses) when the table declares none or the adapter is an administrative
    * one with no readable (the name-taking schema-sync primitives run on such
    * an adapter).
@@ -108,6 +108,13 @@ declare class PostgresAdapter extends BaseDbAdapter {
    * otherwise the pool-based driver.
    */
   private _exec;
+  /**
+   * Relational predicates (`$some` / `$none`) render as correlated
+   * `[NOT] EXISTS` subqueries — in reads and in mutation filters alike.
+   *
+   * @since 0.1.147
+   */
+  supportsRelationFilters(_mode: "read" | "write"): boolean;
   /** PostgreSQL enforces FK constraints natively. */
   supportsNativeForeignKeys(): boolean;
   prepareId(id: unknown, _fieldType: unknown): unknown;
@@ -120,6 +127,8 @@ declare class PostgresAdapter extends BaseDbAdapter {
   calendarBucketUnits(): ReadonlySet<BucketUnit>;
   /** Every aggregate function, `countDistinct` included. */
   aggregateFns(): ReadonlySet<AggregateFn>;
+  /** Computed view columns and first-row joins. */
+  viewCapabilities(): ReadonlySet<TViewCapability>;
   onBeforeFlatten(_type: unknown): void;
   onAfterFlatten(): void;
   onFieldScanned(field: string, _type: unknown, metadata: TMetadataMap<AtscriptMetadata>): void;
@@ -146,6 +155,11 @@ declare class PostgresAdapter extends BaseDbAdapter {
   insertMany(data: Array<Record<string, unknown>>): Promise<TDbInsertManyResult>;
   findOne(query: DbQuery): Promise<Record<string, unknown> | null>;
   findMany(query: DbQuery): Promise<Array<Record<string, unknown>>>;
+  /**
+   * `$skip` / `$limit` per partition in one statement: a `ROW_NUMBER()`
+   * window over `partitionBy` (the generic `$with` loader's per-parent page).
+   */
+  findManyPerPartition(query: DbQuery, partitionBy: readonly string[]): Promise<Array<Record<string, unknown>>>;
   count(query: DbQuery): Promise<number>;
   aggregate(query: DbQuery): Promise<Array<Record<string, unknown>>>;
   /**
@@ -156,6 +170,8 @@ declare class PostgresAdapter extends BaseDbAdapter {
    * older than the runtime's. Other errors propagate unchanged.
    */
   private _wrapBucketZoneError;
+  /** Physical primary-key columns (`@db.column` renames applied). */
+  private _pkColumns;
   /**
    * The predicate that narrows a single-row UPDATE/DELETE to the first row
    * matching `whereSql`: `<key> <op> (SELECT <cols> … LIMIT 1)`. Single-col
@@ -342,8 +358,14 @@ declare class PgDriver implements TPgDriver {
  *
  * Case-insensitive columns (`@db.collate 'nocase'`) are handled by CITEXT
  * column type at the storage level — no query-side wrapping needed.
+ *
+ * Relational predicates (`$some` / `$none`) render as correlated `EXISTS`
+ * subqueries referencing the outer table by `opts.qualifier` (default: the
+ * source table) — a statement with an aliased FROM must pass its alias.
+ *
+ * @param opts - since 0.1.147
  */
-declare function buildWhere(filter: FilterExpr): TSqlFragment;
+declare function buildWhere(filter: FilterExpr, opts?: TFilterVisitorOptions): TSqlFragment;
 //#endregion
 //#region src/index.d.ts
 /**

package/dist/index.mjs

@@ -1,6 +1,6 @@
-import { ALL_AGGREGATE_FNS, ALL_BUCKET_UNITS, BaseDbAdapter, DbError, DbSpace, bucketTimeZoneUnavailable, isColumnTypeChanged, vectorIndexNotFoundMessage } from "@atscript/db";
+import { ALL_AGGREGATE_FNS, ALL_BUCKET_UNITS, ALL_VIEW_CAPABILITIES, BaseDbAdapter, DbError, DbSpace, bucketTimeZoneUnavailable, fkColumns, isColumnTypeChanged, vectorIndexNotFoundMessage } from "@atscript/db";
 import { resolveAggregateSearch } from "@atscript/db/agg";
-import { buildAggregateCount, buildAggregateSelect, buildCreateView, buildDelete, buildGeoSearchCount, buildGeoSearchSelect, buildInsert, buildInsertMany, buildSelect, buildUpdate, buildVectorSearchCount, buildVectorSearchSelect, buildWhere as buildWhere$1, defaultValueForType, defaultValueToSqlLiteral, derivedColumnExpr, fillReplacePayload, finalizeParams, geoWindowFromControls, insertManyColumns, normalizeGeoPointValue, parseRegexString, quotedJsonPathSegments, refActionToSql, renameGeoDistance, replaceColumnsFor, sqlStringLiteral, sqlTimeZoneLiteral, vectorDistanceSource } from "@atscript/db-sql-tools";
+import { SEARCH_SOURCE_ALIAS, buildAggregateCount, buildAggregateSelect, buildCreateView, buildDelete, buildGeoSearchCount, buildGeoSearchSelect, buildInsert, buildInsertMany, buildPartitionedSelect, buildSelect, buildUpdate, buildVectorSearchCount, buildVectorSearchSelect, buildWhere as buildWhere$1, defaultValueForType, defaultValueToSqlLiteral, derivedColumnExpr, fillReplacePayload, finalizeParams, foreignKeySql, geoWindowFromControls, insertManyColumns, normalizeGeoPointValue, parseRegexString, quotedJsonPathSegments, renameGeoDistance, replaceColumnsFor, sqlStringLiteral, sqlTimeZoneLiteral, stripPartitionRowNumber, vectorDistanceSource } from "@atscript/db-sql-tools";
 import { BUCKET_MAX_INSTANT, BUCKET_MIN_INSTANT } from "@uniqu/core";
 //#region src/sql-builder.ts
 /**
@@ -78,6 +78,8 @@ const pgDialect = {
 	},
 	calendarBucket: pgCalendarBucket,
 	jsonExtract: pgJsonExtract,
+	castDouble: (expr) => `CAST(${expr} AS DOUBLE PRECISION)`,
+	nullsSortLargest: true,
 	createViewPrefix: "CREATE OR REPLACE VIEW",
 	paramPlaceholder(index) {
 		return `$${index}`;
@@ -104,33 +106,47 @@ function pgJsonExtract(quotedCol, path, type) {
 /**
 * Calendar-bucket label over an epoch-ms column (BIGINT for
 * `@db.default.now`, DOUBLE PRECISION otherwise): TEXT `'YYYY-MM-DD'` — the
-* local date of the bucket's first day in `b.tz` — or NULL for a NULL source
-* or one outside `[BUCKET_MIN_INSTANT, BUCKET_MAX_INSTANT)`.
+* local date of the bucket's first day in `b.tz` — or, for `hour`,
+* `'YYYY-MM-DDTHH:00'` — the local wall-clock hour — or NULL for a NULL
+* source or one outside `[BUCKET_MIN_INSTANT, BUCKET_MAX_INSTANT)`.
 *
-* The local date is `(to_timestamp(col / 1000) AT TIME ZONE '<tz>')::date`:
-* `timestamptz AT TIME ZONE` yields the wall time in that zone, independent
-* of the session `TimeZone`. Truncation is calendar arithmetic on that date —
-* the week uses the generic `(isodow - weekStart + 7) % 7` formula
-* (`date_trunc('week')` is Monday-only). `date_trunc` and `to_char` get an
-* explicit `::timestamp`: a bare `date` resolves to their `timestamptz`
-* overloads, which would route through the session zone.
+* The wall time is `to_timestamp(col / 1000) AT TIME ZONE '<tz>'`:
+* `timestamptz AT TIME ZONE` yields the (zone-less) wall time in that zone,
+* independent of the session `TimeZone` — so a `+05:30` zone's hour starts at
+* :30 UTC and a DST fall-back's repeated hour is one label. The hour is
+* formatted from it; the other units truncate its `::date` with calendar
+* arithmetic — the week uses the generic `(isodow - weekStart + 7) % 7`
+* formula (`date_trunc('week')` is Monday-only). `date_trunc` and `to_char`
+* get an explicit `::timestamp`: a bare `date` resolves to their
+* `timestamptz` overloads, which would route through the session zone.
 *
 * Parameter-free (the zone is an inlined, charset-checked literal), so the
 * SELECT and GROUP BY renderings match structurally.
 */
 function pgCalendarBucket(quotedCol, b) {
-	const local = `(to_timestamp(${quotedCol}::double precision / 1000) AT TIME ZONE ${sqlTimeZoneLiteral(b.tz)})::date`;
-	let first;
+	const wall = `(to_timestamp(${quotedCol}::double precision / 1000) AT TIME ZONE ${sqlTimeZoneLiteral(b.tz)})`;
+	const local = `${wall}::date`;
+	let value;
+	let format = "YYYY-MM-DD";
 	switch (b.unit) {
+		case "hour":
+			value = wall;
+			format = "YYYY-MM-DD\"T\"HH24\":00\"";
+			break;
 		case "day":
-			first = local;
+			value = local;
 			break;
 		case "week":
-			first = `(${local} - ((EXTRACT(ISODOW FROM ${local})::int - ${b.weekStartIso} + 7) % 7))`;
+			value = `(${local} - ((EXTRACT(ISODOW FROM ${local})::int - ${b.weekStartIso} + 7) % 7))`;
+			break;
+		case "month":
+		case "quarter":
+		case "year":
+			value = `date_trunc('${b.unit}', ${local}::timestamp)`;
 			break;
-		default: first = `date_trunc('${b.unit}', ${local}::timestamp)`;
+		default: throw new Error(`Unhandled calendar bucket unit "${String(b.unit)}"`);
 	}
-	return `CASE WHEN ${quotedCol} >= ${BUCKET_MIN_INSTANT} AND ${quotedCol} < ${BUCKET_MAX_INSTANT} THEN ${`to_char(${first}::timestamp, 'YYYY-MM-DD')`} END`;
+	return `CASE WHEN ${quotedCol} >= ${BUCKET_MIN_INSTANT} AND ${quotedCol} < ${BUCKET_MAX_INSTANT} THEN ${`to_char(${value}::timestamp, '${format}')`} END`;
 }
 /**
 * Distance-in-meters expression from a geography column to a query point.
@@ -320,12 +336,7 @@ function buildCreateTable(table, fields, foreignKeys, options) {
 	}
 	if (foreignKeys) for (const fk of foreignKeys.values()) {
 		if (options?.deferForeignKeysTo?.has(fk.targetTable)) continue;
-		const localCols = fk.fields.map((f) => qi(f)).join(", ");
-		const targetCols = fk.targetFields.map((f) => qi(f)).join(", ");
-		let constraint = `FOREIGN KEY (${localCols}) REFERENCES ${qi(fk.targetTable)} (${targetCols})`;
-		if (fk.onDelete) constraint += ` ON DELETE ${refActionToSql(fk.onDelete)}`;
-		if (fk.onUpdate) constraint += ` ON UPDATE ${refActionToSql(fk.onUpdate)}`;
-		colDefs.push(constraint);
+		colDefs.push(foreignKeySql(qi, fk));
 	}
 	return `CREATE TABLE IF NOT EXISTS ${quoteTableName(table)} (${colDefs.join(", ")})`;
 }
@@ -340,9 +351,15 @@ function buildCreateTable(table, fields, foreignKeys, options) {
 *
 * Case-insensitive columns (`@db.collate 'nocase'`) are handled by CITEXT
 * column type at the storage level — no query-side wrapping needed.
+*
+* Relational predicates (`$some` / `$none`) render as correlated `EXISTS`
+* subqueries referencing the outer table by `opts.qualifier` (default: the
+* source table) — a statement with an aliased FROM must pass its alias.
+*
+* @param opts - since 0.1.147
 */
-function buildWhere(filter) {
-	return buildWhere$1(pgDialect, filter);
+function buildWhere(filter, opts) {
+	return buildWhere$1(pgDialect, filter, opts);
 }
 //#endregion
 //#region src/postgres-adapter.ts
@@ -425,7 +442,7 @@ var PostgresAdapter = class PostgresAdapter extends BaseDbAdapter {
 	_vectorThresholds = /* @__PURE__ */ new Map();
 	/**
 	* Schema name for catalog queries and qualification — `@db.schema` of the
-	* bound table, or `null` (→ `'public'`, the same default the bound path
+	* bound table, or `null` (→ the connection's `current_schema()`, the same default the bound path
 	* uses) when the table declares none or the adapter is an administrative
 	* one with no readable (the name-taking schema-sync primitives run on such
 	* an adapter).
@@ -481,6 +498,15 @@ var PostgresAdapter = class PostgresAdapter extends BaseDbAdapter {
 	_exec() {
 		return this._txConnection() ?? this.driver;
 	}
+	/**
+	* Relational predicates (`$some` / `$none`) render as correlated
+	* `[NOT] EXISTS` subqueries — in reads and in mutation filters alike.
+	*
+	* @since 0.1.147
+	*/
+	supportsRelationFilters(_mode) {
+		return true;
+	}
 	/** PostgreSQL enforces FK constraints natively. */
 	supportsNativeForeignKeys() {
 		return true;
@@ -505,6 +531,10 @@ var PostgresAdapter = class PostgresAdapter extends BaseDbAdapter {
 	aggregateFns() {
 		return ALL_AGGREGATE_FNS;
 	}
+	/** Computed view columns and first-row joins. */
+	viewCapabilities() {
+		return ALL_VIEW_CAPABILITIES;
+	}
 	onBeforeFlatten(_type) {}
 	onAfterFlatten() {
 		for (const fd of this._table.fieldDescriptors) if (fd.collate === "nocase") this._nocaseColumns.add(fd.physicalName);
@@ -607,7 +637,7 @@ var PostgresAdapter = class PostgresAdapter extends BaseDbAdapter {
 	}
 	async insertOne(data) {
 		let { sql, params } = buildInsert$1(this.resolveTableName(), data);
-		const pkCols = this._table.primaryKeys.map((pk) => qi(pk));
+		const pkCols = this._pkColumns().map((pk) => qi(pk));
 		if (pkCols.length > 0) sql += ` RETURNING ${pkCols.join(", ")}`;
 		this._log(sql, params);
 		const returned = (await this._wrapConstraintError(() => this._exec().run(sql, params))).rows?.[0];
@@ -620,7 +650,7 @@ var PostgresAdapter = class PostgresAdapter extends BaseDbAdapter {
 		};
 		return this.withTransaction(async () => {
 			const tableName = this.resolveTableName();
-			const pkCols = this._table.primaryKeys;
+			const pkCols = this._pkColumns();
 			const returningSuffix = pkCols.length > 0 ? ` RETURNING ${pkCols.map((pk) => qi(pk)).join(", ")}` : "";
 			const columns = insertManyColumns(data);
 			const maxRowsPerBatch = columns.length > 0 ? Math.floor(6e4 / columns.length) : data.length;
@@ -659,6 +689,16 @@ var PostgresAdapter = class PostgresAdapter extends BaseDbAdapter {
 		this._log(sql, params);
 		return this._exec().all(sql, params);
 	}
+	/**
+	* `$skip` / `$limit` per partition in one statement: a `ROW_NUMBER()`
+	* window over `partitionBy` (the generic `$with` loader's per-parent page).
+	*/
+	async findManyPerPartition(query, partitionBy) {
+		const where = buildWhere(query.filter);
+		const { sql, params } = buildPartitionedSelect(pgDialect, this.resolveTableName(), where, query.controls, partitionBy);
+		this._log(sql, params);
+		return stripPartitionRowNumber(await this._exec().all(sql, params));
+	}
 	async count(query) {
 		const where = buildWhere(query.filter);
 		const { sql, params } = finalizeParams(pgDialect, {
@@ -698,6 +738,10 @@ var PostgresAdapter = class PostgresAdapter extends BaseDbAdapter {
 			throw error;
 		}
 	}
+	/** Physical primary-key columns (`@db.column` renames applied). */
+	_pkColumns() {
+		return this._table.primaryKeys.map((key) => this._table.physicalPath(key));
+	}
 	/**
 	* The predicate that narrows a single-row UPDATE/DELETE to the first row
 	* matching `whereSql`: `<key> <op> (SELECT <cols> … LIMIT 1)`. Single-col
@@ -707,7 +751,7 @@ var PostgresAdapter = class PostgresAdapter extends BaseDbAdapter {
 	* existing behavior rather than guess.
 	*/
 	_limitOnePredicate(quotedTable, whereSql) {
-		const pkCols = this._table.primaryKeys;
+		const pkCols = this._pkColumns();
 		const quotedKeys = pkCols.length > 0 ? pkCols.map((c) => qi(c)) : ["ctid"];
 		const colList = quotedKeys.join(", ");
 		return `${quotedKeys.length === 1 ? `${colList} =` : `(${colList}) IN`} (SELECT ${colList} FROM ${quotedTable} WHERE ${whereSql} LIMIT 1)`;
@@ -817,7 +861,7 @@ var PostgresAdapter = class PostgresAdapter extends BaseDbAdapter {
        JOIN pg_class cl ON cl.oid = c.conrelid
        JOIN pg_class rcl ON rcl.oid = c.confrelid
        JOIN pg_namespace rn ON rn.oid = rcl.relnamespace
-       WHERE c.contype = 'f' AND rcl.relname = $1 AND rn.nspname = COALESCE($2, 'public')
+       WHERE c.contype = 'f' AND rcl.relname = $1 AND rn.nspname = COALESCE($2, current_schema())
        ORDER BY cl.relname, c.conname`, [tableName, this._schema])).map((r) => ({
 			table: r.table_name,
 			fields: r.columns ?? [],
@@ -827,7 +871,7 @@ var PostgresAdapter = class PostgresAdapter extends BaseDbAdapter {
 	async getObjectKind(name) {
 		switch ((await this._exec().get(`SELECT c.relkind FROM pg_class c
        JOIN pg_namespace n ON n.oid = c.relnamespace
-       WHERE c.relname = $1 AND n.nspname = COALESCE($2, 'public')
+       WHERE c.relname = $1 AND n.nspname = COALESCE($2, current_schema())
          AND c.relkind IN ('r', 'p', 'v', 'm')`, [name, this._schema]))?.relkind) {
 			case "r":
 			case "p": return "table";
@@ -855,7 +899,7 @@ var PostgresAdapter = class PostgresAdapter extends BaseDbAdapter {
 			const row = await this._exec().get(`SELECT c.conname FROM pg_constraint c
          JOIN pg_class cl ON cl.oid = c.conrelid
          JOIN pg_namespace n ON n.oid = cl.relnamespace
-         WHERE c.contype = 'p' AND cl.relname = $1 AND n.nspname = COALESCE($2, 'public')`, [this._table.tableName, this._schema]);
+         WHERE c.contype = 'p' AND cl.relname = $1 AND n.nspname = COALESCE($2, current_schema())`, [this._table.tableName, this._schema]);
 			if (row?.conname) clauses.push(`DROP CONSTRAINT ${qi(row.conname)}`);
 		}
 		if (change.to.length > 0) clauses.push(`ADD PRIMARY KEY (${change.to.map((c) => qi(c)).join(", ")})`);
@@ -887,8 +931,8 @@ var PostgresAdapter = class PostgresAdapter extends BaseDbAdapter {
               ) AS is_pk
        FROM information_schema.columns c
        JOIN pg_attribute a ON a.attname = c.column_name
-         AND a.attrelid = (SELECT oid FROM pg_class WHERE relname = $1 AND relnamespace = (SELECT oid FROM pg_namespace WHERE nspname = COALESCE($2, 'public')))
-       WHERE c.table_name = $1 AND c.table_schema = COALESCE($2, 'public')
+         AND a.attrelid = (SELECT oid FROM pg_class WHERE relname = $1 AND relnamespace = (SELECT oid FROM pg_namespace WHERE nspname = COALESCE($2, current_schema())))
+       WHERE c.table_name = $1 AND c.table_schema = COALESCE($2, current_schema())
        ORDER BY c.ordinal_position`, [tableName, schema])).map((r) => {
 			const column = {
 				name: r.column_name,
@@ -1008,10 +1052,10 @@ var PostgresAdapter = class PostgresAdapter extends BaseDbAdapter {
          CROSS JOIN LATERAL unnest(c.conkey, c.confkey) WITH ORDINALITY AS k(attnum, refattnum, ord)
          JOIN pg_attribute a ON a.attrelid = c.conrelid AND a.attnum = k.attnum
          JOIN pg_attribute ra ON ra.attrelid = c.confrelid AND ra.attnum = k.refattnum
-         WHERE c.contype = 'f' AND rcl.relname = $2 AND rn.nspname = COALESCE($1, 'public')
+         WHERE c.contype = 'f' AND rcl.relname = $2 AND rn.nspname = COALESCE($1, current_schema())
          ORDER BY n.nspname, cl.relname, c.conname, k.ord`, [schema, this._table.tableName]);
 			const inboundFks = /* @__PURE__ */ new Map();
-			const ownSchema = schema ?? "public";
+			const ownSchema = schema ?? (await conn.get("SELECT current_schema() AS s"))?.s ?? "public";
 			for (const fk of fkRefs) {
 				if (fk.table_schema === ownSchema && fk.table_name === this._table.tableName) continue;
 				const key = `${fk.table_schema}.${fk.table_name}.${fk.constraint_name}`;
@@ -1106,7 +1150,7 @@ var PostgresAdapter = class PostgresAdapter extends BaseDbAdapter {
        FROM pg_constraint c
        JOIN pg_class cl ON cl.oid = c.conrelid
        JOIN pg_namespace n ON n.oid = cl.relnamespace
-       WHERE cl.relname = $1 AND n.nspname = COALESCE($2, 'public')
+       WHERE cl.relname = $1 AND n.nspname = COALESCE($2, current_schema())
        ORDER BY c.conname`, [table, this._schema]);
 		const taken = new Set(rows.map((r) => r.conname));
 		for (const { conname, contype, columns } of rows) {
@@ -1130,7 +1174,7 @@ var PostgresAdapter = class PostgresAdapter extends BaseDbAdapter {
 	async _relationExists(conn, name) {
 		return (await conn.get(`SELECT true AS present FROM pg_class c
        JOIN pg_namespace n ON n.oid = c.relnamespace
-       WHERE c.relname = $1 AND n.nspname = COALESCE($2, 'public')`, [name, this._schema]))?.present ?? false;
+       WHERE c.relname = $1 AND n.nspname = COALESCE($2, current_schema())`, [name, this._schema]))?.present ?? false;
 	}
 	async afterSyncTable() {
 		await this._resetIdentitySequences();
@@ -1153,7 +1197,7 @@ var PostgresAdapter = class PostgresAdapter extends BaseDbAdapter {
 		}
 	}
 	async tableExists() {
-		return (await this._exec().get(`SELECT EXISTS (SELECT 1 FROM information_schema.tables WHERE table_name = $1 AND table_schema = COALESCE($2, 'public')) AS "exists"`, [this._table.tableName, this._schema]))?.exists ?? false;
+		return (await this._exec().get(`SELECT EXISTS (SELECT 1 FROM information_schema.tables WHERE table_name = $1 AND table_schema = COALESCE($2, current_schema())) AS "exists"`, [this._table.tableName, this._schema]))?.exists ?? false;
 	}
 	/**
 	* No CASCADE: when something outside the sync inventory (a user view, an
@@ -1182,7 +1226,7 @@ var PostgresAdapter = class PostgresAdapter extends BaseDbAdapter {
        JOIN pg_class i ON i.oid = x.indexrelid
        JOIN pg_namespace n ON n.oid = t.relnamespace
        JOIN pg_attribute a ON a.attrelid = t.oid AND a.attnum = ANY(x.indkey)
-       WHERE t.relname = $1 AND n.nspname = COALESCE($2, 'public')
+       WHERE t.relname = $1 AND n.nspname = COALESCE($2, current_schema())
          AND i.relname LIKE 'atscript__%' AND a.attname = ANY($3)`, [
 			tableName,
 			schema,
@@ -1234,7 +1278,7 @@ var PostgresAdapter = class PostgresAdapter extends BaseDbAdapter {
            JOIN pg_class t ON t.oid = x.indrelid
            JOIN pg_class i ON i.oid = x.indexrelid
            JOIN pg_namespace n ON n.oid = t.relnamespace
-           WHERE t.relname = $1 AND n.nspname = COALESCE($2, 'public')`, [tableName, schema])).map((r) => ({
+           WHERE t.relname = $1 AND n.nspname = COALESCE($2, current_schema())`, [tableName, schema])).map((r) => ({
 					name: r.name,
 					columns: r.columns ?? void 0
 				}));
@@ -1280,7 +1324,7 @@ var PostgresAdapter = class PostgresAdapter extends BaseDbAdapter {
 	async syncForeignKeys() {
 		const existingByName = await this._getExistingFkConstraints();
 		const desiredFkKeys = /* @__PURE__ */ new Set();
-		for (const fk of this._table.foreignKeys.values()) desiredFkKeys.add([...fk.fields].toSorted().join(","));
+		for (const fk of this._table.foreignKeys.values()) desiredFkKeys.add([...fkColumns(fk).fields].toSorted().join(","));
 		for (const [constraintName, columns] of existingByName) {
 			const key = [...columns].toSorted().join(",");
 			if (!desiredFkKeys.has(key)) {
@@ -1291,13 +1335,9 @@ var PostgresAdapter = class PostgresAdapter extends BaseDbAdapter {
 		}
 		const existingKeys = new Set([...existingByName.values()].map((cols) => cols.toSorted().join(",")));
 		for (const fk of this._table.foreignKeys.values()) {
-			const key = [...fk.fields].toSorted().join(",");
+			const key = [...fkColumns(fk).fields].toSorted().join(",");
 			if (!existingKeys.has(key)) {
-				const localCols = fk.fields.map((f) => qi(f)).join(", ");
-				const targetCols = fk.targetFields.map((f) => qi(f)).join(", ");
-				let ddl = `ALTER TABLE ${quoteTableName(this.resolveTableName())} ADD FOREIGN KEY (${localCols}) REFERENCES ${qi(fk.targetTable)} (${targetCols})`;
-				if (fk.onDelete) ddl += ` ON DELETE ${refActionToSql(fk.onDelete)}`;
-				if (fk.onUpdate) ddl += ` ON UPDATE ${refActionToSql(fk.onUpdate)}`;
+				const ddl = `ALTER TABLE ${quoteTableName(this.resolveTableName())} ADD ${foreignKeySql(qi, fk)}`;
 				this._log(ddl);
 				await this._exec().exec(ddl);
 			}
@@ -1324,7 +1364,7 @@ var PostgresAdapter = class PostgresAdapter extends BaseDbAdapter {
        JOIN pg_namespace n ON n.oid = cl.relnamespace
        CROSS JOIN LATERAL unnest(c.conkey) WITH ORDINALITY AS k(attnum, ord)
        JOIN pg_attribute a ON a.attrelid = c.conrelid AND a.attnum = k.attnum
-       WHERE c.contype = 'f' AND cl.relname = $1 AND n.nspname = COALESCE($2, 'public')
+       WHERE c.contype = 'f' AND cl.relname = $1 AND n.nspname = COALESCE($2, current_schema())
        ORDER BY c.conname, k.ord`, [this._table.tableName, this._schema]);
 		const byName = /* @__PURE__ */ new Map();
 		for (const row of rows) {
@@ -1469,7 +1509,7 @@ var PostgresAdapter = class PostgresAdapter extends BaseDbAdapter {
 			vec = first.value[1];
 		}
 		const distanceOp = similarityToPgOp(vec.similarity);
-		const where = buildWhere(query.filter);
+		const where = buildWhere(query.filter, { qualifier: pgDialect.quoteTable(SEARCH_SOURCE_ALIAS) });
 		const controls = query.controls || {};
 		const threshold = this._resolveVectorThreshold(controls, vec.indexName);
 		return {
@@ -1562,7 +1602,7 @@ var PostgresAdapter = class PostgresAdapter extends BaseDbAdapter {
 		const controls = query.controls ?? {};
 		return {
 			tableName: this.resolveTableName(),
-			where: buildWhere(query.filter),
+			where: buildWhere(query.filter, { qualifier: pgDialect.quoteTable(SEARCH_SOURCE_ALIAS) }),
 			dist: pgGeoDistanceExpr(qi(column), point),
 			window: geoWindowFromControls(controls),
 			controls

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atscript/db-postgres",
-  "version": "0.1.146",
+  "version": "0.1.147",
   "description": "PostgreSQL adapter for @atscript/db with pg (node-postgres) driver support.",
   "keywords": [
     "atscript",
@@ -43,20 +43,20 @@
     "access": "public"
   },
   "devDependencies": {
-    "@atscript/core": "^0.1.98",
-    "@atscript/typescript": "^0.1.98",
+    "@atscript/core": "^0.1.99",
+    "@atscript/typescript": "^0.1.99",
     "@types/pg": "^8.11.0",
-    "@uniqu/core": "^0.1.11",
+    "@uniqu/core": "^0.1.12",
     "pg": "^8.13.0",
-    "unplugin-atscript": "^0.1.98"
+    "unplugin-atscript": "^0.1.99"
   },
   "peerDependencies": {
-    "@atscript/core": "^0.1.98",
-    "@atscript/typescript": "^0.1.98",
-    "@uniqu/core": "^0.1.11",
+    "@atscript/core": "^0.1.99",
+    "@atscript/typescript": "^0.1.99",
+    "@uniqu/core": "^0.1.12",
     "pg": ">=8.0.0",
-    "@atscript/db": "^0.1.146",
-    "@atscript/db-sql-tools": "^0.1.146"
+    "@atscript/db": "^0.1.147",
+    "@atscript/db-sql-tools": "^0.1.147"
   },
   "peerDependenciesMeta": {
     "pg": {