@atscript/db-postgres 0.1.140 → 0.1.142

package/dist/index.cjs

@@ -188,6 +188,29 @@ function buildAggregateCount(table, where, controls) {
 	return (0, _atscript_db_sql_tools.buildAggregateCount)(pgDialect, table, where, controls);
 }
 /**
+* The `COLLATE` clause of a column (native `@db.pg.collate`, else the
+* portable `@db.column.collate` mapping) — `""` when none applies.
+*/
+function pgCollateClause(field) {
+	const nativeCollate = field.type?.metadata?.get("db.pg.collate");
+	if (nativeCollate) return ` COLLATE "${nativeCollate}"`;
+	if (field.collate) {
+		const pgCollate = collationToPg(field.collate);
+		if (pgCollate) return ` COLLATE ${pgCollate}`;
+	}
+	return "";
+}
+/**
+* The definition of a `@db.column.derived` column (since 0.1.141):
+* `"col" type [COLLATE …] GENERATED ALWAYS AS (<json extraction>) STORED` —
+* always STORED (PostgreSQL's only generated kind before 18; adding one
+* rewrites the table), nullable, no DEFAULT. Shared by CREATE TABLE and
+* ADD COLUMN.
+*/
+function pgDerivedColumnDef(field, sqlType) {
+	return `${qi(field.physicalName)} ${sqlType}${pgCollateClause(field)} GENERATED ALWAYS AS (${(0, _atscript_db_sql_tools.derivedColumnExpr)(pgDialect, field)}) STORED`;
+}
+/**
 * Maps portable collation values to PostgreSQL collation names.
 *
 * Returns `null` for `'nocase'` — case-insensitive columns use CITEXT type instead
@@ -268,6 +291,10 @@ function buildCreateTable(table, fields, foreignKeys, options) {
 	for (const field of fields) {
 		if (field.ignored) continue;
 		const sqlType = options?.typeMapper?.(field) ?? pgTypeFromField(field);
+		if (field.derived) {
+			colDefs.push(pgDerivedColumnDef(field, sqlType));
+			continue;
+		}
 		let def = `${qi(field.physicalName)} ${sqlType}`;
 		if (options?.incrementFields?.has(field.physicalName)) {
 			const start = options.autoIncrementStart;
@@ -279,12 +306,7 @@ function buildCreateTable(table, fields, foreignKeys, options) {
 			if (field.defaultValue.fn === "uuid") def += " DEFAULT gen_random_uuid()";
 			else if (field.defaultValue.fn === "now") def += " DEFAULT (extract(epoch from now()) * 1000)::bigint";
 		}
-		const nativeCollate = field.type?.metadata?.get("db.pg.collate");
-		if (nativeCollate) def += ` COLLATE "${nativeCollate}"`;
-		else if (field.collate) {
-			const pgCollate = collationToPg(field.collate);
-			if (pgCollate) def += ` COLLATE ${pgCollate}`;
-		}
+		def += pgCollateClause(field);
 		colDefs.push(def);
 	}
 	if (primaryKeys.length === 1) {
@@ -688,18 +710,29 @@ var PostgresAdapter = class PostgresAdapter extends _atscript_db.BaseDbAdapter {
 			throw error;
 		}
 	}
+	/**
+	* The predicate that narrows a single-row UPDATE/DELETE to the first row
+	* matching `whereSql`: `<key> <op> (SELECT <cols> … LIMIT 1)`. Single-col
+	* PKs use `<col> = (SELECT <col> …)`; composite PKs the row-constructor form
+	* `(c1, c2) IN (SELECT c1, c2 …)`. Tables with no declared PK fall back to
+	* ctid — concurrency on PK-less tables is already ill-defined; preserve
+	* existing behavior rather than guess.
+	*/
+	_limitOnePredicate(quotedTable, whereSql) {
+		const pkCols = this._table.primaryKeys;
+		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)`;
+	}
 	async updateOne(filter, data, ops, expectedVersion) {
 		const where = buildWhere(filter);
 		const tableName = this.resolveTableName();
 		const quotedTable = quoteTableName(tableName);
-		const pkCols = this._table.primaryKeys;
-		const quotedKeys = (pkCols.length > 0 ? pkCols : ["ctid"]).map((c) => c === "ctid" ? "ctid" : qi(c));
-		const colList = quotedKeys.join(", ");
 		const limitedWhere = {
-			sql: `${quotedKeys.length === 1 ? quotedKeys[0] : `(${colList})`} ${quotedKeys.length === 1 ? "=" : "IN"} (SELECT ${colList} FROM ${quotedTable} WHERE ${where.sql} LIMIT 1)`,
+			sql: this._limitOnePredicate(quotedTable, where.sql),
 			params: where.params
 		};
-		const versionColumn = this._table.versionColumn;
+		const versionColumn = this._table.versionColumnPhysical;
 		const { sql, params } = buildUpdate(tableName, data, limitedWhere, void 0, ops, versionColumn, expectedVersion);
 		this._log(sql, params);
 		const result = await this._wrapConstraintError(() => this._exec().run(sql, params));
@@ -710,7 +743,7 @@ var PostgresAdapter = class PostgresAdapter extends _atscript_db.BaseDbAdapter {
 	}
 	async updateMany(filter, data, ops) {
 		const where = buildWhere(filter);
-		const versionColumn = this._table.versionColumn;
+		const versionColumn = this._table.versionColumnPhysical;
 		const { sql, params } = buildUpdate(this.resolveTableName(), data, where, void 0, ops, versionColumn);
 		this._log(sql, params);
 		const result = await this._wrapConstraintError(() => this._exec().run(sql, params));
@@ -720,7 +753,7 @@ var PostgresAdapter = class PostgresAdapter extends _atscript_db.BaseDbAdapter {
 		};
 	}
 	async replaceOne(filter, data, expectedVersion) {
-		const full = (0, _atscript_db_sql_tools.fillReplacePayload)(data, (0, _atscript_db_sql_tools.replaceColumnsFor)(this._table.fieldDescriptors, this.nativeDefaultFns()), this._table.versionColumn);
+		const full = (0, _atscript_db_sql_tools.fillReplacePayload)(data, (0, _atscript_db_sql_tools.replaceColumnsFor)(this._table.fieldDescriptors, this.nativeDefaultFns()), this._table.versionColumnPhysical);
 		return this.updateOne(filter, full, void 0, expectedVersion);
 	}
 	async replaceMany(filter, data) {
@@ -728,10 +761,10 @@ var PostgresAdapter = class PostgresAdapter extends _atscript_db.BaseDbAdapter {
 	}
 	async deleteOne(filter) {
 		const where = buildWhere(filter);
-		const tableName = this.resolveTableName();
+		const quotedTable = quoteTableName(this.resolveTableName());
 		const { sql, params } = (0, _atscript_db_sql_tools.finalizeParams)(pgDialect, {
-			sql: `DELETE FROM ${quoteTableName(tableName)} WHERE ctid = (SELECT ctid FROM ${quoteTableName(tableName)} WHERE ${where.sql} LIMIT 1)`,
-			params: where.params
+			sql: `DELETE FROM ${quotedTable} WHERE ${where.sql} AND ${this._limitOnePredicate(quotedTable, where.sql)}`,
+			params: [...where.params, ...where.params]
 		});
 		this._log(sql, params);
 		return { deletedCount: (await this._wrapConstraintError(() => this._exec().run(sql, params))).affectedRows };
@@ -858,7 +891,7 @@ var PostgresAdapter = class PostgresAdapter extends _atscript_db.BaseDbAdapter {
 	/** Live columns of `tableName`, read through `exec` (the recreate's own connection, or the pool). */
 	async _readColumns(exec, tableName) {
 		const schema = this._schema;
-		return (await exec.all(`SELECT c.column_name, c.data_type, c.udt_name, c.character_maximum_length, c.numeric_precision, c.numeric_scale, c.is_nullable, c.column_default, c.is_identity,
+		return (await exec.all(`SELECT c.column_name, c.data_type, c.udt_name, c.character_maximum_length, c.numeric_precision, c.numeric_scale, c.is_nullable, c.column_default, c.is_identity, c.is_generated,
               format_type(a.atttypid, a.atttypmod) AS formatted_type,
               EXISTS (
                 SELECT 1 FROM pg_index i
@@ -868,13 +901,17 @@ var PostgresAdapter = class PostgresAdapter extends _atscript_db.BaseDbAdapter {
        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')
-       ORDER BY c.ordinal_position`, [tableName, schema])).map((r) => ({
-			name: r.column_name,
-			type: normalizePgType(r.data_type, r.character_maximum_length, r.numeric_precision, r.numeric_scale, r.udt_name, r.formatted_type),
-			notnull: r.is_nullable === "NO",
-			pk: r.is_pk,
-			dflt_value: normalizePgDefault(r.column_default, r.is_identity)
-		}));
+       ORDER BY c.ordinal_position`, [tableName, schema])).map((r) => {
+			const column = {
+				name: r.column_name,
+				type: normalizePgType(r.data_type, r.character_maximum_length, r.numeric_precision, r.numeric_scale, r.udt_name, r.formatted_type),
+				notnull: r.is_nullable === "NO",
+				pk: r.is_pk,
+				dflt_value: normalizePgDefault(r.column_default, r.is_identity)
+			};
+			if (r.is_generated === "ALWAYS") column.generated = true;
+			return column;
+		});
 	}
 	async syncColumns(diff) {
 		if (this._nocaseColumns.size > 0) await this._exec().exec("CREATE EXTENSION IF NOT EXISTS citext");
@@ -887,8 +924,14 @@ var PostgresAdapter = class PostgresAdapter extends _atscript_db.BaseDbAdapter {
 			await this._exec().exec(ddl);
 			renamed.push(field.physicalName);
 		}
+		const derivedAdds = [];
 		for (const field of diff.added) {
 			const sqlType = this.typeMapper(field);
+			if (field.derived) {
+				derivedAdds.push(`ADD COLUMN ${pgDerivedColumnDef(field, sqlType)}`);
+				added.push(field.physicalName);
+				continue;
+			}
 			let ddl = `ALTER TABLE ${quoteTableName(tableName)} ADD COLUMN ${qi(field.physicalName)} ${sqlType}`;
 			if (field.defaultValue?.kind === "fn" && field.defaultValue.fn === "increment") ddl += " GENERATED BY DEFAULT AS IDENTITY";
 			else {
@@ -899,18 +942,16 @@ var PostgresAdapter = class PostgresAdapter extends _atscript_db.BaseDbAdapter {
 					else if (field.defaultValue.fn === "now") ddl += " DEFAULT (extract(epoch from now()) * 1000)::bigint";
 				} else if (!field.optional && !field.isPrimaryKey) ddl += ` DEFAULT ${defaultValueForType(field.designType)}`;
 			}
-			if (field.collate) {
-				const nativeCollate = field.type?.metadata?.get("db.pg.collate");
-				if (nativeCollate) ddl += ` COLLATE "${nativeCollate}"`;
-				else {
-					const pgCollate = collationToPg(field.collate);
-					if (pgCollate) ddl += ` COLLATE ${pgCollate}`;
-				}
-			}
+			ddl += pgCollateClause(field);
 			this._log(ddl);
 			await this._exec().exec(ddl);
 			added.push(field.physicalName);
 		}
+		if (derivedAdds.length > 0) {
+			const ddl = `ALTER TABLE ${quoteTableName(tableName)} ${derivedAdds.join(", ")}`;
+			this._log(ddl);
+			await this._exec().exec(ddl);
+		}
 		for (const { field } of diff.typeChanged ?? []) {
 			const sqlType = this.typeMapper(field);
 			const col = qi(field.physicalName);
@@ -1016,7 +1057,7 @@ var PostgresAdapter = class PostgresAdapter extends _atscript_db.BaseDbAdapter {
 			this._log(createSql);
 			await conn.exec(createSql);
 			const oldTypes = new Map((await this._readColumns(conn, this._table.tableName)).map((c) => [c.name, c.type]));
-			const commonFields = this._table.fieldDescriptors.filter((f) => !f.ignored && oldTypes.has(f.physicalName));
+			const commonFields = this._table.storedDescriptors.filter((f) => oldTypes.has(f.physicalName));
 			if (commonFields.length > 0) {
 				const colNames = commonFields.map((f) => qi(f.physicalName)).join(", ");
 				const selectExprs = commonFields.map((field) => {

package/dist/index.d.cts

@@ -156,6 +156,15 @@ declare class PostgresAdapter extends BaseDbAdapter {
    * older than the runtime's. Other errors propagate unchanged.
    */
   private _wrapBucketZoneError;
+  /**
+   * The predicate that narrows a single-row UPDATE/DELETE to the first row
+   * matching `whereSql`: `<key> <op> (SELECT <cols> … LIMIT 1)`. Single-col
+   * PKs use `<col> = (SELECT <col> …)`; composite PKs the row-constructor form
+   * `(c1, c2) IN (SELECT c1, c2 …)`. Tables with no declared PK fall back to
+   * ctid — concurrency on PK-less tables is already ill-defined; preserve
+   * existing behavior rather than guess.
+   */
+  private _limitOnePredicate;
   updateOne(filter: FilterExpr, data: Record<string, unknown>, ops?: TFieldOps, expectedVersion?: number): Promise<TDbUpdateResult>;
   updateMany(filter: FilterExpr, data: Record<string, unknown>, ops?: TFieldOps): Promise<TDbUpdateResult>;
   replaceOne(filter: FilterExpr, data: Record<string, unknown>, expectedVersion?: number): Promise<TDbUpdateResult>;

package/dist/index.d.mts

@@ -156,6 +156,15 @@ declare class PostgresAdapter extends BaseDbAdapter {
    * older than the runtime's. Other errors propagate unchanged.
    */
   private _wrapBucketZoneError;
+  /**
+   * The predicate that narrows a single-row UPDATE/DELETE to the first row
+   * matching `whereSql`: `<key> <op> (SELECT <cols> … LIMIT 1)`. Single-col
+   * PKs use `<col> = (SELECT <col> …)`; composite PKs the row-constructor form
+   * `(c1, c2) IN (SELECT c1, c2 …)`. Tables with no declared PK fall back to
+   * ctid — concurrency on PK-less tables is already ill-defined; preserve
+   * existing behavior rather than guess.
+   */
+  private _limitOnePredicate;
   updateOne(filter: FilterExpr, data: Record<string, unknown>, ops?: TFieldOps, expectedVersion?: number): Promise<TDbUpdateResult>;
   updateMany(filter: FilterExpr, data: Record<string, unknown>, ops?: TFieldOps): Promise<TDbUpdateResult>;
   replaceOne(filter: FilterExpr, data: Record<string, unknown>, expectedVersion?: number): Promise<TDbUpdateResult>;

package/dist/index.mjs

@@ -1,6 +1,6 @@
 import { ALL_AGGREGATE_FNS, ALL_BUCKET_UNITS, BaseDbAdapter, DbError, DbSpace, bucketTimeZoneUnavailable, isColumnTypeChanged } from "@atscript/db";
 import { resolveAggregateSearch } from "@atscript/db/agg";
-import { buildAggregateCount, buildAggregateSelect, buildCreateView, buildDelete, buildGeoSearchCount, buildGeoSearchSelect, buildInsert, buildInsertMany, buildSelect, buildUpdate, buildWhere as buildWhere$1, defaultValueForType, defaultValueToSqlLiteral, fillReplacePayload, finalizeParams, geoWindowFromControls, insertManyColumns, normalizeGeoPointValue, parseRegexString, quotedJsonPathSegments, refActionToSql, renameGeoDistance, replaceColumnsFor, sqlStringLiteral, sqlTimeZoneLiteral } from "@atscript/db-sql-tools";
+import { buildAggregateCount, buildAggregateSelect, buildCreateView, buildDelete, buildGeoSearchCount, buildGeoSearchSelect, buildInsert, buildInsertMany, buildSelect, buildUpdate, buildWhere as buildWhere$1, defaultValueForType, defaultValueToSqlLiteral, derivedColumnExpr, fillReplacePayload, finalizeParams, geoWindowFromControls, insertManyColumns, normalizeGeoPointValue, parseRegexString, quotedJsonPathSegments, refActionToSql, renameGeoDistance, replaceColumnsFor, sqlStringLiteral, sqlTimeZoneLiteral } from "@atscript/db-sql-tools";
 import { BUCKET_MAX_INSTANT, BUCKET_MIN_INSTANT } from "@uniqu/core";
 //#region src/sql-builder.ts
 /**
@@ -187,6 +187,29 @@ function buildAggregateCount$1(table, where, controls) {
 	return buildAggregateCount(pgDialect, table, where, controls);
 }
 /**
+* The `COLLATE` clause of a column (native `@db.pg.collate`, else the
+* portable `@db.column.collate` mapping) — `""` when none applies.
+*/
+function pgCollateClause(field) {
+	const nativeCollate = field.type?.metadata?.get("db.pg.collate");
+	if (nativeCollate) return ` COLLATE "${nativeCollate}"`;
+	if (field.collate) {
+		const pgCollate = collationToPg(field.collate);
+		if (pgCollate) return ` COLLATE ${pgCollate}`;
+	}
+	return "";
+}
+/**
+* The definition of a `@db.column.derived` column (since 0.1.141):
+* `"col" type [COLLATE …] GENERATED ALWAYS AS (<json extraction>) STORED` —
+* always STORED (PostgreSQL's only generated kind before 18; adding one
+* rewrites the table), nullable, no DEFAULT. Shared by CREATE TABLE and
+* ADD COLUMN.
+*/
+function pgDerivedColumnDef(field, sqlType) {
+	return `${qi(field.physicalName)} ${sqlType}${pgCollateClause(field)} GENERATED ALWAYS AS (${derivedColumnExpr(pgDialect, field)}) STORED`;
+}
+/**
 * Maps portable collation values to PostgreSQL collation names.
 *
 * Returns `null` for `'nocase'` — case-insensitive columns use CITEXT type instead
@@ -267,6 +290,10 @@ function buildCreateTable(table, fields, foreignKeys, options) {
 	for (const field of fields) {
 		if (field.ignored) continue;
 		const sqlType = options?.typeMapper?.(field) ?? pgTypeFromField(field);
+		if (field.derived) {
+			colDefs.push(pgDerivedColumnDef(field, sqlType));
+			continue;
+		}
 		let def = `${qi(field.physicalName)} ${sqlType}`;
 		if (options?.incrementFields?.has(field.physicalName)) {
 			const start = options.autoIncrementStart;
@@ -278,12 +305,7 @@ function buildCreateTable(table, fields, foreignKeys, options) {
 			if (field.defaultValue.fn === "uuid") def += " DEFAULT gen_random_uuid()";
 			else if (field.defaultValue.fn === "now") def += " DEFAULT (extract(epoch from now()) * 1000)::bigint";
 		}
-		const nativeCollate = field.type?.metadata?.get("db.pg.collate");
-		if (nativeCollate) def += ` COLLATE "${nativeCollate}"`;
-		else if (field.collate) {
-			const pgCollate = collationToPg(field.collate);
-			if (pgCollate) def += ` COLLATE ${pgCollate}`;
-		}
+		def += pgCollateClause(field);
 		colDefs.push(def);
 	}
 	if (primaryKeys.length === 1) {
@@ -687,18 +709,29 @@ var PostgresAdapter = class PostgresAdapter extends BaseDbAdapter {
 			throw error;
 		}
 	}
+	/**
+	* The predicate that narrows a single-row UPDATE/DELETE to the first row
+	* matching `whereSql`: `<key> <op> (SELECT <cols> … LIMIT 1)`. Single-col
+	* PKs use `<col> = (SELECT <col> …)`; composite PKs the row-constructor form
+	* `(c1, c2) IN (SELECT c1, c2 …)`. Tables with no declared PK fall back to
+	* ctid — concurrency on PK-less tables is already ill-defined; preserve
+	* existing behavior rather than guess.
+	*/
+	_limitOnePredicate(quotedTable, whereSql) {
+		const pkCols = this._table.primaryKeys;
+		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)`;
+	}
 	async updateOne(filter, data, ops, expectedVersion) {
 		const where = buildWhere(filter);
 		const tableName = this.resolveTableName();
 		const quotedTable = quoteTableName(tableName);
-		const pkCols = this._table.primaryKeys;
-		const quotedKeys = (pkCols.length > 0 ? pkCols : ["ctid"]).map((c) => c === "ctid" ? "ctid" : qi(c));
-		const colList = quotedKeys.join(", ");
 		const limitedWhere = {
-			sql: `${quotedKeys.length === 1 ? quotedKeys[0] : `(${colList})`} ${quotedKeys.length === 1 ? "=" : "IN"} (SELECT ${colList} FROM ${quotedTable} WHERE ${where.sql} LIMIT 1)`,
+			sql: this._limitOnePredicate(quotedTable, where.sql),
 			params: where.params
 		};
-		const versionColumn = this._table.versionColumn;
+		const versionColumn = this._table.versionColumnPhysical;
 		const { sql, params } = buildUpdate$1(tableName, data, limitedWhere, void 0, ops, versionColumn, expectedVersion);
 		this._log(sql, params);
 		const result = await this._wrapConstraintError(() => this._exec().run(sql, params));
@@ -709,7 +742,7 @@ var PostgresAdapter = class PostgresAdapter extends BaseDbAdapter {
 	}
 	async updateMany(filter, data, ops) {
 		const where = buildWhere(filter);
-		const versionColumn = this._table.versionColumn;
+		const versionColumn = this._table.versionColumnPhysical;
 		const { sql, params } = buildUpdate$1(this.resolveTableName(), data, where, void 0, ops, versionColumn);
 		this._log(sql, params);
 		const result = await this._wrapConstraintError(() => this._exec().run(sql, params));
@@ -719,7 +752,7 @@ var PostgresAdapter = class PostgresAdapter extends BaseDbAdapter {
 		};
 	}
 	async replaceOne(filter, data, expectedVersion) {
-		const full = fillReplacePayload(data, replaceColumnsFor(this._table.fieldDescriptors, this.nativeDefaultFns()), this._table.versionColumn);
+		const full = fillReplacePayload(data, replaceColumnsFor(this._table.fieldDescriptors, this.nativeDefaultFns()), this._table.versionColumnPhysical);
 		return this.updateOne(filter, full, void 0, expectedVersion);
 	}
 	async replaceMany(filter, data) {
@@ -727,10 +760,10 @@ var PostgresAdapter = class PostgresAdapter extends BaseDbAdapter {
 	}
 	async deleteOne(filter) {
 		const where = buildWhere(filter);
-		const tableName = this.resolveTableName();
+		const quotedTable = quoteTableName(this.resolveTableName());
 		const { sql, params } = finalizeParams(pgDialect, {
-			sql: `DELETE FROM ${quoteTableName(tableName)} WHERE ctid = (SELECT ctid FROM ${quoteTableName(tableName)} WHERE ${where.sql} LIMIT 1)`,
-			params: where.params
+			sql: `DELETE FROM ${quotedTable} WHERE ${where.sql} AND ${this._limitOnePredicate(quotedTable, where.sql)}`,
+			params: [...where.params, ...where.params]
 		});
 		this._log(sql, params);
 		return { deletedCount: (await this._wrapConstraintError(() => this._exec().run(sql, params))).affectedRows };
@@ -857,7 +890,7 @@ var PostgresAdapter = class PostgresAdapter extends BaseDbAdapter {
 	/** Live columns of `tableName`, read through `exec` (the recreate's own connection, or the pool). */
 	async _readColumns(exec, tableName) {
 		const schema = this._schema;
-		return (await exec.all(`SELECT c.column_name, c.data_type, c.udt_name, c.character_maximum_length, c.numeric_precision, c.numeric_scale, c.is_nullable, c.column_default, c.is_identity,
+		return (await exec.all(`SELECT c.column_name, c.data_type, c.udt_name, c.character_maximum_length, c.numeric_precision, c.numeric_scale, c.is_nullable, c.column_default, c.is_identity, c.is_generated,
               format_type(a.atttypid, a.atttypmod) AS formatted_type,
               EXISTS (
                 SELECT 1 FROM pg_index i
@@ -867,13 +900,17 @@ var PostgresAdapter = class PostgresAdapter extends BaseDbAdapter {
        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')
-       ORDER BY c.ordinal_position`, [tableName, schema])).map((r) => ({
-			name: r.column_name,
-			type: normalizePgType(r.data_type, r.character_maximum_length, r.numeric_precision, r.numeric_scale, r.udt_name, r.formatted_type),
-			notnull: r.is_nullable === "NO",
-			pk: r.is_pk,
-			dflt_value: normalizePgDefault(r.column_default, r.is_identity)
-		}));
+       ORDER BY c.ordinal_position`, [tableName, schema])).map((r) => {
+			const column = {
+				name: r.column_name,
+				type: normalizePgType(r.data_type, r.character_maximum_length, r.numeric_precision, r.numeric_scale, r.udt_name, r.formatted_type),
+				notnull: r.is_nullable === "NO",
+				pk: r.is_pk,
+				dflt_value: normalizePgDefault(r.column_default, r.is_identity)
+			};
+			if (r.is_generated === "ALWAYS") column.generated = true;
+			return column;
+		});
 	}
 	async syncColumns(diff) {
 		if (this._nocaseColumns.size > 0) await this._exec().exec("CREATE EXTENSION IF NOT EXISTS citext");
@@ -886,8 +923,14 @@ var PostgresAdapter = class PostgresAdapter extends BaseDbAdapter {
 			await this._exec().exec(ddl);
 			renamed.push(field.physicalName);
 		}
+		const derivedAdds = [];
 		for (const field of diff.added) {
 			const sqlType = this.typeMapper(field);
+			if (field.derived) {
+				derivedAdds.push(`ADD COLUMN ${pgDerivedColumnDef(field, sqlType)}`);
+				added.push(field.physicalName);
+				continue;
+			}
 			let ddl = `ALTER TABLE ${quoteTableName(tableName)} ADD COLUMN ${qi(field.physicalName)} ${sqlType}`;
 			if (field.defaultValue?.kind === "fn" && field.defaultValue.fn === "increment") ddl += " GENERATED BY DEFAULT AS IDENTITY";
 			else {
@@ -898,18 +941,16 @@ var PostgresAdapter = class PostgresAdapter extends BaseDbAdapter {
 					else if (field.defaultValue.fn === "now") ddl += " DEFAULT (extract(epoch from now()) * 1000)::bigint";
 				} else if (!field.optional && !field.isPrimaryKey) ddl += ` DEFAULT ${defaultValueForType$1(field.designType)}`;
 			}
-			if (field.collate) {
-				const nativeCollate = field.type?.metadata?.get("db.pg.collate");
-				if (nativeCollate) ddl += ` COLLATE "${nativeCollate}"`;
-				else {
-					const pgCollate = collationToPg(field.collate);
-					if (pgCollate) ddl += ` COLLATE ${pgCollate}`;
-				}
-			}
+			ddl += pgCollateClause(field);
 			this._log(ddl);
 			await this._exec().exec(ddl);
 			added.push(field.physicalName);
 		}
+		if (derivedAdds.length > 0) {
+			const ddl = `ALTER TABLE ${quoteTableName(tableName)} ${derivedAdds.join(", ")}`;
+			this._log(ddl);
+			await this._exec().exec(ddl);
+		}
 		for (const { field } of diff.typeChanged ?? []) {
 			const sqlType = this.typeMapper(field);
 			const col = qi(field.physicalName);
@@ -1015,7 +1056,7 @@ var PostgresAdapter = class PostgresAdapter extends BaseDbAdapter {
 			this._log(createSql);
 			await conn.exec(createSql);
 			const oldTypes = new Map((await this._readColumns(conn, this._table.tableName)).map((c) => [c.name, c.type]));
-			const commonFields = this._table.fieldDescriptors.filter((f) => !f.ignored && oldTypes.has(f.physicalName));
+			const commonFields = this._table.storedDescriptors.filter((f) => oldTypes.has(f.physicalName));
 			if (commonFields.length > 0) {
 				const colNames = commonFields.map((f) => qi(f.physicalName)).join(", ");
 				const selectExprs = commonFields.map((field) => {

package/dist/plugin.cjs

@@ -28,6 +28,7 @@ const annotations = {
 	schema: new _atscript_core.AnnotationSpec({
 		description: "Specifies the PostgreSQL schema for the table.\n\n**Default:** `\"public\"`\n\n```atscript\n@db.pg.schema \"analytics\"\nexport interface Events { ... }\n```",
 		nodeType: ["interface"],
+		passedWhenReferred: false,
 		multiple: false,
 		argument: {
 			name: "schema",

package/dist/plugin.mjs

@@ -24,6 +24,7 @@ const annotations = {
 	schema: new AnnotationSpec({
 		description: "Specifies the PostgreSQL schema for the table.\n\n**Default:** `\"public\"`\n\n```atscript\n@db.pg.schema \"analytics\"\nexport interface Events { ... }\n```",
 		nodeType: ["interface"],
+		passedWhenReferred: false,
 		multiple: false,
 		argument: {
 			name: "schema",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atscript/db-postgres",
-  "version": "0.1.140",
+  "version": "0.1.142",
   "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.92",
-    "@atscript/typescript": "^0.1.92",
+    "@atscript/core": "^0.1.95",
+    "@atscript/typescript": "^0.1.95",
     "@types/pg": "^8.11.0",
     "@uniqu/core": "^0.1.11",
     "pg": "^8.13.0",
-    "unplugin-atscript": "^0.1.92"
+    "unplugin-atscript": "^0.1.95"
   },
   "peerDependencies": {
-    "@atscript/core": "^0.1.92",
-    "@atscript/typescript": "^0.1.92",
+    "@atscript/core": "^0.1.95",
+    "@atscript/typescript": "^0.1.95",
     "@uniqu/core": "^0.1.11",
     "pg": ">=8.0.0",
-    "@atscript/db": "^0.1.140",
-    "@atscript/db-sql-tools": "^0.1.140"
+    "@atscript/db": "^0.1.142",
+    "@atscript/db-sql-tools": "^0.1.142"
   },
   "peerDependenciesMeta": {
     "pg": {