@atscript/db-postgres 0.1.153 → 0.1.155

package/dist/index.cjs

@@ -138,6 +138,12 @@ function toPgValue(value) {
 	if (typeof value === "object") return JSON.stringify(value);
 	return value;
 }
+/**
+* Text a JSON column can take as it is (`SqlDialect.jsonFromText`): an
+* object / array (by its first characters), or a whole JSON string, number,
+* `true`, `false` or `null` — so `42 Main St` is no number.
+*/
+const PG_JSON_LIKE = String.raw`^\s*(\{\s*["}]|\[\s*(["{[\]tfn0-9-])|("([^"\\]|\\.)*"|-?(0|[1-9][0-9]*)(\.[0-9]+)?([eE][+-]?[0-9]+)?|true|false|null)\s*$)`;
 const pgDialect = {
 	quoteIdentifier(name) {
 		return qi(name);
@@ -171,6 +177,9 @@ const pgDialect = {
 	},
 	calendarBucket: pgCalendarBucket,
 	jsonExtract: pgJsonExtract,
+	jsonExtractText: (quotedCol, path) => `((${quotedCol})::jsonb #>> ${pgJsonPath(path)})`,
+	jsonExtractValue: (quotedCol, path) => `NULLIF((${quotedCol})::jsonb #> ${pgJsonPath(path)}, 'null'::jsonb)`,
+	jsonFromText: (quotedCol) => `CASE WHEN ${quotedCol} ~ '${PG_JSON_LIKE}' THEN ${quotedCol} ELSE to_jsonb(${quotedCol})::text END`,
 	castDouble: (expr) => `CAST(${expr} AS DOUBLE PRECISION)`,
 	anyValue: pgAnyValue,
 	booleanAggregates: {
@@ -204,6 +213,10 @@ const PG_JSON_LEAF_CAST = {
 	number: "::double precision",
 	boolean: "::boolean"
 };
+/** A `#>` / `#>>` path literal (`'{"a","b"}'`). */
+function pgJsonPath(path) {
+	return (0, _atscript_db_sql_tools.sqlStringLiteral)(`{${(0, _atscript_db_sql_tools.quotedJsonPathSegments)(path).join(",")}}`);
+}
 /**
 * Typed read of a JSON leaf (`SqlDialect.jsonExtract`): `jsonb_typeof()`
 * guards the declared type, so a missing path, JSON `null` or another JSON
@@ -211,7 +224,7 @@ const PG_JSON_LEAF_CAST = {
 * native. The column is cast `::jsonb`, so JSON and JSONB storage both work.
 */
 function pgJsonExtract(quotedCol, path, type) {
-	const p = (0, _atscript_db_sql_tools.sqlStringLiteral)(`{${(0, _atscript_db_sql_tools.quotedJsonPathSegments)(path).join(",")}}`);
+	const p = pgJsonPath(path);
 	const j = `(${quotedCol})::jsonb`;
 	const cast = PG_JSON_LEAF_CAST[type];
 	return `CASE jsonb_typeof(${j} #> ${p}) WHEN '${type}' THEN ${cast ? `(${j} #>> ${p})${cast}` : `${j} #>> ${p}`} END`;
@@ -513,6 +526,13 @@ const GEO_PROBE_SQL = `SELECT EXISTS (SELECT 1 FROM pg_extension WHERE extname =
      LEFT JOIN pg_type b ON b.oid = NULLIF(t.typbasetype, 0)
     WHERE a.attrelid = to_regclass($1::text) AND a.attnum > 0 AND NOT a.attisdropped
       AND a.attname = ANY($2::text[])) AS "columns"`;
+const identity = (value) => value;
+/** A column type node-postgres parses on read. */
+const PG_JSON_TYPE = /^\s*jsonb?\s*$/i;
+/** A JSON string value as JSON text — see `formatValue`. */
+function reencodeJsonString(value) {
+	return typeof value === "string" ? JSON.stringify(value) : value;
+}
 /** A PostGIS column type — a geo value binds as EWKT. Anything else (JSONB, TEXT) takes the JSON form. */
 const POSTGIS_TYPES = new Set(["geography", "geometry"]);
 /** The SQL `$geoWithin` renders (`pgDialect.geoWithin`) — PostGIS only. */
@@ -868,6 +888,10 @@ var PostgresAdapter = class PostgresAdapter extends _atscript_db.BaseDbAdapter {
 				}
 			};
 		}
+		if (field.storage === "json" && !field.encrypted && PG_JSON_TYPE.test(this.typeMapper(field))) return {
+			toStorage: identity,
+			fromStorage: reencodeJsonString
+		};
 	}
 	/**
 	* Wraps an async write operation to catch PostgreSQL constraint errors
@@ -1305,6 +1329,12 @@ var PostgresAdapter = class PostgresAdapter extends _atscript_db.BaseDbAdapter {
 		this._log(sql);
 		return (await this._exec().get(sql, []))?.present ?? false;
 	}
+	async countKeyViolations(columns, tableName) {
+		const sql = (0, _atscript_db_sql_tools.buildKeyViolationCount)(pgDialect, tableName ? this._qualify(tableName) : quoteTableName(this.resolveTableName()), columns);
+		this._log(sql);
+		const row = await this._exec().get(sql, []);
+		return Number(row?.violations ?? 0);
+	}
 	/**
 	* Live foreign keys referencing `tableName`, via `pg_constraint` — exact for
 	* composite keys (`conkey`/`confkey` are positionally aligned, unlike the
@@ -1350,8 +1380,9 @@ var PostgresAdapter = class PostgresAdapter extends _atscript_db.BaseDbAdapter {
 	}
 	/**
 	* `ALTER TABLE … DROP CONSTRAINT <pk>, ADD PRIMARY KEY (…)` in ONE statement
-	* (atomic). Called on an empty table only; `ADD PRIMARY KEY` makes the new
-	* key columns NOT NULL. A demoted identity column is handled by the
+	* (atomic: rows a concurrent write made violate the new key fail it with
+	* the old key in place). Called on an empty table or one whose rows satisfy
+	* the new key; `ADD PRIMARY KEY` makes the new key columns NOT NULL. A demoted identity column is handled by the
 	* `defaultChanged` diff (`DROP IDENTITY`).
 	*/
 	async rebuildPrimaryKey(change) {
@@ -1445,10 +1476,10 @@ var PostgresAdapter = class PostgresAdapter extends _atscript_db.BaseDbAdapter {
 			this._log(ddl);
 			await this._exec().exec(ddl);
 		}
-		for (const { field } of diff.typeChanged ?? []) {
+		for (const { field, existingType } of diff.typeChanged ?? []) {
 			const sqlType = this.typeMapper(field);
 			const col = qi(field.physicalName);
-			const ddl = `ALTER TABLE ${quoteTableName(tableName)} ALTER COLUMN ${col} TYPE ${sqlType} USING ${convertColumnExpr(col, field, sqlType)}`;
+			const ddl = `ALTER TABLE ${quoteTableName(tableName)} ALTER COLUMN ${col} TYPE ${sqlType} USING ${convertColumnExpr(col, field, sqlType, existingType)}`;
 			this._log(ddl);
 			await this._exec().exec(ddl);
 		}
@@ -1556,8 +1587,9 @@ var PostgresAdapter = class PostgresAdapter extends _atscript_db.BaseDbAdapter {
 				const selectExprs = commonFields.map((field) => {
 					const c = qi(field.physicalName);
 					const sqlType = this.typeMapper(field);
-					const changed = (0, _atscript_db.isColumnTypeChanged)(oldTypes.get(field.physicalName), sqlType);
-					const value = changed ? convertColumnExpr(c, field, sqlType) : c;
+					const oldType = oldTypes.get(field.physicalName);
+					const changed = (0, _atscript_db.isColumnTypeChanged)(oldType, sqlType);
+					const value = changed ? convertColumnExpr(c, field, sqlType, oldType) : c;
 					if (!field.optional && !field.isPrimaryKey) return `COALESCE(${value}, ${field.defaultValue?.kind === "value" ? defaultValueToSqlLiteral(field.designType, field.defaultValue.value) : defaultValueForType(field.designType)}) AS ${c}`;
 					return changed ? `${value} AS ${c}` : c;
 				}).join(", ");
@@ -1674,6 +1706,20 @@ var PostgresAdapter = class PostgresAdapter extends _atscript_db.BaseDbAdapter {
 		this._log(ddl);
 		await this._exec().exec(ddl);
 	}
+	async copyFromJsonColumn(source, targets) {
+		const sql = (0, _atscript_db_sql_tools.buildJsonColumnCopy)(pgDialect, this.resolveTableName(), source, targets, (expr, target) => {
+			if (target.kind !== "text") return expr;
+			const type = this.typeMapper(target.field);
+			return /^(VARCHAR|CHAR)\b/i.test(type) ? expr : `(${expr})::${type}`;
+		});
+		this._log(sql);
+		await this._exec().exec(sql);
+	}
+	async jsonifyTextColumn(column) {
+		const sql = (0, _atscript_db_sql_tools.buildJsonifyText)(pgDialect, this.resolveTableName(), column);
+		this._log(sql);
+		await this._exec().exec(sql);
+	}
 	async dropColumns(columns) {
 		const tableName = this.resolveTableName();
 		const drops = columns.map((col) => `DROP COLUMN ${qi(col)}`).join(", ");
@@ -2190,6 +2236,8 @@ var PostgresAdapter = class PostgresAdapter extends _atscript_db.BaseDbAdapter {
 };
 /** A text / character type: the value is converted by the assignment into the column. */
 const CHARACTER_TYPE = /^\s*(?:text|varchar|character varying|char|character|bpchar)\b/i;
+/** A floating-point / decimal column type (live or mapped). */
+const FRACTIONAL_TYPE = /^\s*(?:double precision|float[48]?|real|numeric|decimal)\b/i;
 /**
 * The expression converting column `col` (quoted) to `sqlType`, the field's
 * new type — one rule for `ALTER COLUMN … TYPE … USING` and the recreate copy.
@@ -2197,11 +2245,19 @@ const CHARACTER_TYPE = /^\s*(?:text|varchar|character varying|char|character|bpc
 * fails the statement instead of being coerced. A TEXT / VARCHAR(n) / CHAR(n)
 * target stops at `::text`: an explicit cast to VARCHAR(n) / CHAR(n) would
 * truncate an over-long value, the assignment into the column rejects it
-* (since 0.1.137).
+* (since 0.1.137). An epoch-ms fractional column (`existingType`) becoming
+* the `BIGINT` of `@db.default.now` (`number.timestamp` →
+* `number.timestamp.created`) is rounded (since 0.1.155): its text
+* (`1700000000123.5`) does not parse as an integer. Any other fractional
+* value still fails a change to an integer type.
 */
-function convertColumnExpr(col, field, sqlType) {
-	if (field.isGeoPoint && sqlType.startsWith("geography")) return `CASE WHEN ${col} IS NULL THEN NULL ELSE ST_SetSRID(ST_MakePoint((${col}->>0)::float8, (${col}->>1)::float8), 4326)::geography END`;
+function convertColumnExpr(col, field, sqlType, existingType) {
+	if (field.isGeoPoint && sqlType.startsWith("geography")) {
+		const json = `${col}::jsonb`;
+		return `CASE WHEN ${col} IS NULL THEN NULL ELSE ST_SetSRID(ST_MakePoint((${json}->>0)::float8, (${json}->>1)::float8), 4326)::geography END`;
+	}
 	if (CHARACTER_TYPE.test(sqlType)) return `${col}::text`;
+	if (field.defaultValue?.kind === "fn" && field.defaultValue.fn === "now" && /^BIGINT$/i.test(sqlType.trim()) && existingType && FRACTIONAL_TYPE.test(existingType)) return `round(${col})::bigint`;
 	return `${col}::text::${sqlType}`;
 }
 /**
@@ -2361,6 +2417,10 @@ function createCustomTypes(pgTypes) {
 		return pgTypes.getTypeParser(oid, format);
 	} };
 }
+/** The warning logged for a pool client whose connection broke (`57P01`, `ECONNRESET`, …). */
+function lostConnectionMessage(err, where) {
+	return `[atscript/db-postgres] ${where} pool connection lost (${err.code ?? err.name}): ${err.message}`;
+}
 /**
 * {@link TPgDriver} implementation backed by `pg` (node-postgres).
 *
@@ -2387,6 +2447,12 @@ function createCustomTypes(pgTypes) {
 * const driver = new PgDriver(pool)
 * ```
 *
+* A broken pool connection (a terminated backend, failover, network reset) is
+* logged through `options.logger` instead of crashing the process (since
+* 0.1.154): idle clients of a pool the driver creates, and clients checked out
+* for a transaction. A pre-created `pg.Pool` is the caller's — attach your own
+* `pool.on('error', …)` listener, or an idle client's error crashes the process.
+*
 * Requires `pg` to be installed:
 * ```bash
 * pnpm add pg
@@ -2395,7 +2461,9 @@ function createCustomTypes(pgTypes) {
 var PgDriver = class {
 	pool;
 	poolInit;
-	constructor(poolOrConfig) {
+	logger;
+	constructor(poolOrConfig, options = {}) {
+		this.logger = options.logger ?? console;
 		if (typeof poolOrConfig === "object" && typeof poolOrConfig.query === "function") this.pool = poolOrConfig;
 		else this.poolInit = import("pg").then((pg) => {
 			const Pool = pg.default?.Pool ?? pg.Pool;
@@ -2409,6 +2477,7 @@ var PgDriver = class {
 				...poolOrConfig,
 				types: customTypes
 			});
+			this.pool.on("error", (err) => this.logger.warn(lostConnectionMessage(err, "idle")));
 			return this.pool;
 		});
 	}
@@ -2433,6 +2502,13 @@ var PgDriver = class {
 	}
 	async getConnection() {
 		const client = await (await this.getPool()).connect();
+		let lost;
+		const onError = (err) => {
+			if (lost) return;
+			lost = err;
+			this.logger.warn(lostConnectionMessage(err, "checked-out"));
+		};
+		client.on("error", onError);
 		return {
 			async run(sql, params) {
 				const result = await client.query(sql, sanitizeParams(params));
@@ -2451,7 +2527,8 @@ var PgDriver = class {
 				await client.query(sql);
 			},
 			release() {
-				client.release();
+				client.removeListener("error", onError);
+				client.release(lost);
 			}
 		};
 	}

package/dist/index.d.cts

@@ -1,4 +1,4 @@
-import { AggregateFn, BaseDbAdapter, BucketUnit, DbQuery, DbSpace, FilterExpr, TColumnDiff, TDbDefaultFn, TDbDeleteResult, TDbFieldMeta, TDbInsertIgnoreOptions, TDbInsertIgnoreSlot, TDbInsertManyResult, TDbInsertResult, TDbObjectKind, TDbUpdateOptions, TDbUpdateResult, TEnsureTableOptions, TExistingColumn, TFieldOps, TPrimaryKeyChange, TReferencingForeignKey, TSearchIndexInfo, TSyncColumnResult, TValueFormatterPair, TViewCapability } from "@atscript/db";
+import { AggregateFn, BaseDbAdapter, BucketUnit, DbQuery, DbSpace, FilterExpr, TColumnDiff, TDbDefaultFn, TDbDeleteResult, TDbFieldMeta, TDbInsertIgnoreOptions, TDbInsertIgnoreSlot, TDbInsertManyResult, TDbInsertResult, TDbObjectKind, TDbUpdateOptions, TDbUpdateResult, TEnsureTableOptions, TExistingColumn, TFieldOps, TGenericLogger, TJsonCopyTarget, TPrimaryKeyChange, TReferencingForeignKey, TSearchIndexInfo, TSyncColumnResult, TValueFormatterPair, TViewCapability } from "@atscript/db";
 import { TMetadataMap } from "@atscript/typescript/utils";
 import { TFilterVisitorOptions, TSqlFragment } from "@atscript/db-sql-tools";
 
@@ -293,6 +293,7 @@ declare class PostgresAdapter extends BaseDbAdapter {
   /** `schema.name` when the adapter targets a named schema. */
   private _qualify;
   hasRows(tableName?: string): Promise<boolean>;
+  countKeyViolations(columns: readonly string[], tableName?: string): Promise<number>;
   /**
    * Live foreign keys referencing `tableName`, via `pg_constraint` — exact for
    * composite keys (`conkey`/`confkey` are positionally aligned, unlike the
@@ -304,8 +305,9 @@ declare class PostgresAdapter extends BaseDbAdapter {
   dropTablesByName(tableNames: string[]): Promise<void>;
   /**
    * `ALTER TABLE … DROP CONSTRAINT <pk>, ADD PRIMARY KEY (…)` in ONE statement
-   * (atomic). Called on an empty table only; `ADD PRIMARY KEY` makes the new
-   * key columns NOT NULL. A demoted identity column is handled by the
+   * (atomic: rows a concurrent write made violate the new key fail it with
+   * the old key in place). Called on an empty table or one whose rows satisfy
+   * the new key; `ADD PRIMARY KEY` makes the new key columns NOT NULL. A demoted identity column is handled by the
    * `defaultChanged` diff (`DROP IDENTITY`).
    */
   rebuildPrimaryKey(change: TPrimaryKeyChange): Promise<void>;
@@ -346,6 +348,8 @@ declare class PostgresAdapter extends BaseDbAdapter {
    * dependents.
    */
   dropTable(): Promise<void>;
+  copyFromJsonColumn(source: string, targets: readonly TJsonCopyTarget[]): Promise<void>;
+  jsonifyTextColumn(column: string): Promise<void>;
   dropColumns(columns: string[]): Promise<void>;
   dropIndexesForColumns(columns: string[]): Promise<void>;
   dropTableByName(tableName: string): Promise<void>;
@@ -442,6 +446,14 @@ declare class PostgresAdapter extends BaseDbAdapter {
 }
 //#endregion
 //#region src/pg-driver.d.ts
+/** Options of {@link PgDriver}. */
+interface TPgDriverOptions {
+  /**
+   * Receives a warning when a pool connection breaks — a terminated backend,
+   * failover or network reset (default `console`). See {@link PgDriver}.
+   */
+  logger?: Pick<TGenericLogger, "warn">;
+}
 /**
  * {@link TPgDriver} implementation backed by `pg` (node-postgres).
  *
@@ -468,6 +480,12 @@ declare class PostgresAdapter extends BaseDbAdapter {
  * const driver = new PgDriver(pool)
  * ```
  *
+ * A broken pool connection (a terminated backend, failover, network reset) is
+ * logged through `options.logger` instead of crashing the process (since
+ * 0.1.154): idle clients of a pool the driver creates, and clients checked out
+ * for a transaction. A pre-created `pg.Pool` is the caller's — attach your own
+ * `pool.on('error', …)` listener, or an idle client's error crashes the process.
+ *
  * Requires `pg` to be installed:
  * ```bash
  * pnpm add pg
@@ -476,7 +494,8 @@ declare class PostgresAdapter extends BaseDbAdapter {
 declare class PgDriver implements TPgDriver {
   private pool;
   private poolInit;
-  constructor(poolOrConfig: string | import("pg").Pool | import("pg").PoolConfig);
+  private readonly logger;
+  constructor(poolOrConfig: string | import("pg").Pool | import("pg").PoolConfig, options?: TPgDriverOptions);
   private getPool;
   run(sql: string, params?: unknown[]): Promise<TPgRunResult>;
   all<T = Record<string, unknown>>(sql: string, params?: unknown[]): Promise<T[]>;
@@ -517,4 +536,4 @@ declare function buildWhere(filter: FilterExpr, opts?: TFilterVisitorOptions): T
  */
 declare function createAdapter(uri: string, options?: Record<string, unknown>): DbSpace;
 //#endregion
-export { PgDriver, PostgresAdapter, type TPgConnection, type TPgDriver, type TPgRunResult, type TSqlFragment, buildWhere, createAdapter };
+export { PgDriver, PostgresAdapter, type TPgConnection, type TPgDriver, type TPgDriverOptions, type TPgRunResult, type TSqlFragment, buildWhere, createAdapter };

package/dist/index.d.mts

@@ -1,4 +1,4 @@
-import { AggregateFn, BaseDbAdapter, BucketUnit, DbQuery, DbSpace, FilterExpr, TColumnDiff, TDbDefaultFn, TDbDeleteResult, TDbFieldMeta, TDbInsertIgnoreOptions, TDbInsertIgnoreSlot, TDbInsertManyResult, TDbInsertResult, TDbObjectKind, TDbUpdateOptions, TDbUpdateResult, TEnsureTableOptions, TExistingColumn, TFieldOps, TPrimaryKeyChange, TReferencingForeignKey, TSearchIndexInfo, TSyncColumnResult, TValueFormatterPair, TViewCapability } from "@atscript/db";
+import { AggregateFn, BaseDbAdapter, BucketUnit, DbQuery, DbSpace, FilterExpr, TColumnDiff, TDbDefaultFn, TDbDeleteResult, TDbFieldMeta, TDbInsertIgnoreOptions, TDbInsertIgnoreSlot, TDbInsertManyResult, TDbInsertResult, TDbObjectKind, TDbUpdateOptions, TDbUpdateResult, TEnsureTableOptions, TExistingColumn, TFieldOps, TGenericLogger, TJsonCopyTarget, TPrimaryKeyChange, TReferencingForeignKey, TSearchIndexInfo, TSyncColumnResult, TValueFormatterPair, TViewCapability } from "@atscript/db";
 import { TFilterVisitorOptions, TSqlFragment } from "@atscript/db-sql-tools";
 import { TMetadataMap } from "@atscript/typescript/utils";
 
@@ -293,6 +293,7 @@ declare class PostgresAdapter extends BaseDbAdapter {
   /** `schema.name` when the adapter targets a named schema. */
   private _qualify;
   hasRows(tableName?: string): Promise<boolean>;
+  countKeyViolations(columns: readonly string[], tableName?: string): Promise<number>;
   /**
    * Live foreign keys referencing `tableName`, via `pg_constraint` — exact for
    * composite keys (`conkey`/`confkey` are positionally aligned, unlike the
@@ -304,8 +305,9 @@ declare class PostgresAdapter extends BaseDbAdapter {
   dropTablesByName(tableNames: string[]): Promise<void>;
   /**
    * `ALTER TABLE … DROP CONSTRAINT <pk>, ADD PRIMARY KEY (…)` in ONE statement
-   * (atomic). Called on an empty table only; `ADD PRIMARY KEY` makes the new
-   * key columns NOT NULL. A demoted identity column is handled by the
+   * (atomic: rows a concurrent write made violate the new key fail it with
+   * the old key in place). Called on an empty table or one whose rows satisfy
+   * the new key; `ADD PRIMARY KEY` makes the new key columns NOT NULL. A demoted identity column is handled by the
    * `defaultChanged` diff (`DROP IDENTITY`).
    */
   rebuildPrimaryKey(change: TPrimaryKeyChange): Promise<void>;
@@ -346,6 +348,8 @@ declare class PostgresAdapter extends BaseDbAdapter {
    * dependents.
    */
   dropTable(): Promise<void>;
+  copyFromJsonColumn(source: string, targets: readonly TJsonCopyTarget[]): Promise<void>;
+  jsonifyTextColumn(column: string): Promise<void>;
   dropColumns(columns: string[]): Promise<void>;
   dropIndexesForColumns(columns: string[]): Promise<void>;
   dropTableByName(tableName: string): Promise<void>;
@@ -442,6 +446,14 @@ declare class PostgresAdapter extends BaseDbAdapter {
 }
 //#endregion
 //#region src/pg-driver.d.ts
+/** Options of {@link PgDriver}. */
+interface TPgDriverOptions {
+  /**
+   * Receives a warning when a pool connection breaks — a terminated backend,
+   * failover or network reset (default `console`). See {@link PgDriver}.
+   */
+  logger?: Pick<TGenericLogger, "warn">;
+}
 /**
  * {@link TPgDriver} implementation backed by `pg` (node-postgres).
  *
@@ -468,6 +480,12 @@ declare class PostgresAdapter extends BaseDbAdapter {
  * const driver = new PgDriver(pool)
  * ```
  *
+ * A broken pool connection (a terminated backend, failover, network reset) is
+ * logged through `options.logger` instead of crashing the process (since
+ * 0.1.154): idle clients of a pool the driver creates, and clients checked out
+ * for a transaction. A pre-created `pg.Pool` is the caller's — attach your own
+ * `pool.on('error', …)` listener, or an idle client's error crashes the process.
+ *
  * Requires `pg` to be installed:
  * ```bash
  * pnpm add pg
@@ -476,7 +494,8 @@ declare class PostgresAdapter extends BaseDbAdapter {
 declare class PgDriver implements TPgDriver {
   private pool;
   private poolInit;
-  constructor(poolOrConfig: string | import("pg").Pool | import("pg").PoolConfig);
+  private readonly logger;
+  constructor(poolOrConfig: string | import("pg").Pool | import("pg").PoolConfig, options?: TPgDriverOptions);
   private getPool;
   run(sql: string, params?: unknown[]): Promise<TPgRunResult>;
   all<T = Record<string, unknown>>(sql: string, params?: unknown[]): Promise<T[]>;
@@ -517,4 +536,4 @@ declare function buildWhere(filter: FilterExpr, opts?: TFilterVisitorOptions): T
  */
 declare function createAdapter(uri: string, options?: Record<string, unknown>): DbSpace;
 //#endregion
-export { PgDriver, PostgresAdapter, type TPgConnection, type TPgDriver, type TPgRunResult, type TSqlFragment, buildWhere, createAdapter };
+export { PgDriver, PostgresAdapter, type TPgConnection, type TPgDriver, type TPgDriverOptions, type TPgRunResult, type TSqlFragment, buildWhere, createAdapter };

package/dist/index.mjs

@@ -1,6 +1,6 @@
 import { ALL_AGGREGATE_FNS, ALL_BUCKET_UNITS, ALL_VIEW_CAPABILITIES, BaseDbAdapter, DbError, DbSpace, bucketTimeZoneUnavailable, defaultFulltextIndex, describeFulltext, fkColumns, isColumnTypeChanged, searchTermInteger, splitFulltextFields, uniqueKeyTuple, vectorIndexNotFoundMessage } from "@atscript/db";
 import { resolveAggregateSearch } from "@atscript/db/agg";
-import { SEARCH_SOURCE_ALIAS, arithOverflowError, buildAggregateCount, buildAggregateSelect, buildCreateView, buildDelete, buildGeoSearchCount, buildGeoSearchSelect, buildInsert, buildInsertMany, buildPartitionedSelect, buildSelect, buildUpdate, buildVectorSearchCount, buildVectorSearchSelect, buildWhere as buildWhere$1, chunkInsertRows, defaultValueForType, defaultValueToSqlLiteral, derivedColumnExpr, fillReplacePayload, finalizeParams, foreignKeySql, geoWindowFromControls, mapQueryErrors, normalizeGeoPointValue, numericOutOfRangeError, orFragment, parseRegexString, quotedJsonPathSegments, renameGeoDistance, replaceColumnsFor, sqlStringLiteral, sqlTimeZoneLiteral, stripPartitionRowNumber, vectorDistanceSource } from "@atscript/db-sql-tools";
+import { SEARCH_SOURCE_ALIAS, arithOverflowError, buildAggregateCount, buildAggregateSelect, buildCreateView, buildDelete, buildGeoSearchCount, buildGeoSearchSelect, buildInsert, buildInsertMany, buildJsonColumnCopy, buildJsonifyText, buildKeyViolationCount, buildPartitionedSelect, buildSelect, buildUpdate, buildVectorSearchCount, buildVectorSearchSelect, buildWhere as buildWhere$1, chunkInsertRows, defaultValueForType, defaultValueToSqlLiteral, derivedColumnExpr, fillReplacePayload, finalizeParams, foreignKeySql, geoWindowFromControls, mapQueryErrors, normalizeGeoPointValue, numericOutOfRangeError, orFragment, 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/insert-ignore.ts
 /**
@@ -137,6 +137,12 @@ function toPgValue(value) {
 	if (typeof value === "object") return JSON.stringify(value);
 	return value;
 }
+/**
+* Text a JSON column can take as it is (`SqlDialect.jsonFromText`): an
+* object / array (by its first characters), or a whole JSON string, number,
+* `true`, `false` or `null` — so `42 Main St` is no number.
+*/
+const PG_JSON_LIKE = String.raw`^\s*(\{\s*["}]|\[\s*(["{[\]tfn0-9-])|("([^"\\]|\\.)*"|-?(0|[1-9][0-9]*)(\.[0-9]+)?([eE][+-]?[0-9]+)?|true|false|null)\s*$)`;
 const pgDialect = {
 	quoteIdentifier(name) {
 		return qi(name);
@@ -170,6 +176,9 @@ const pgDialect = {
 	},
 	calendarBucket: pgCalendarBucket,
 	jsonExtract: pgJsonExtract,
+	jsonExtractText: (quotedCol, path) => `((${quotedCol})::jsonb #>> ${pgJsonPath(path)})`,
+	jsonExtractValue: (quotedCol, path) => `NULLIF((${quotedCol})::jsonb #> ${pgJsonPath(path)}, 'null'::jsonb)`,
+	jsonFromText: (quotedCol) => `CASE WHEN ${quotedCol} ~ '${PG_JSON_LIKE}' THEN ${quotedCol} ELSE to_jsonb(${quotedCol})::text END`,
 	castDouble: (expr) => `CAST(${expr} AS DOUBLE PRECISION)`,
 	anyValue: pgAnyValue,
 	booleanAggregates: {
@@ -203,6 +212,10 @@ const PG_JSON_LEAF_CAST = {
 	number: "::double precision",
 	boolean: "::boolean"
 };
+/** A `#>` / `#>>` path literal (`'{"a","b"}'`). */
+function pgJsonPath(path) {
+	return sqlStringLiteral(`{${quotedJsonPathSegments(path).join(",")}}`);
+}
 /**
 * Typed read of a JSON leaf (`SqlDialect.jsonExtract`): `jsonb_typeof()`
 * guards the declared type, so a missing path, JSON `null` or another JSON
@@ -210,7 +223,7 @@ const PG_JSON_LEAF_CAST = {
 * native. The column is cast `::jsonb`, so JSON and JSONB storage both work.
 */
 function pgJsonExtract(quotedCol, path, type) {
-	const p = sqlStringLiteral(`{${quotedJsonPathSegments(path).join(",")}}`);
+	const p = pgJsonPath(path);
 	const j = `(${quotedCol})::jsonb`;
 	const cast = PG_JSON_LEAF_CAST[type];
 	return `CASE jsonb_typeof(${j} #> ${p}) WHEN '${type}' THEN ${cast ? `(${j} #>> ${p})${cast}` : `${j} #>> ${p}`} END`;
@@ -512,6 +525,13 @@ const GEO_PROBE_SQL = `SELECT EXISTS (SELECT 1 FROM pg_extension WHERE extname =
      LEFT JOIN pg_type b ON b.oid = NULLIF(t.typbasetype, 0)
     WHERE a.attrelid = to_regclass($1::text) AND a.attnum > 0 AND NOT a.attisdropped
       AND a.attname = ANY($2::text[])) AS "columns"`;
+const identity = (value) => value;
+/** A column type node-postgres parses on read. */
+const PG_JSON_TYPE = /^\s*jsonb?\s*$/i;
+/** A JSON string value as JSON text — see `formatValue`. */
+function reencodeJsonString(value) {
+	return typeof value === "string" ? JSON.stringify(value) : value;
+}
 /** A PostGIS column type — a geo value binds as EWKT. Anything else (JSONB, TEXT) takes the JSON form. */
 const POSTGIS_TYPES = new Set(["geography", "geometry"]);
 /** The SQL `$geoWithin` renders (`pgDialect.geoWithin`) — PostGIS only. */
@@ -867,6 +887,10 @@ var PostgresAdapter = class PostgresAdapter extends BaseDbAdapter {
 				}
 			};
 		}
+		if (field.storage === "json" && !field.encrypted && PG_JSON_TYPE.test(this.typeMapper(field))) return {
+			toStorage: identity,
+			fromStorage: reencodeJsonString
+		};
 	}
 	/**
 	* Wraps an async write operation to catch PostgreSQL constraint errors
@@ -1304,6 +1328,12 @@ var PostgresAdapter = class PostgresAdapter extends BaseDbAdapter {
 		this._log(sql);
 		return (await this._exec().get(sql, []))?.present ?? false;
 	}
+	async countKeyViolations(columns, tableName) {
+		const sql = buildKeyViolationCount(pgDialect, tableName ? this._qualify(tableName) : quoteTableName(this.resolveTableName()), columns);
+		this._log(sql);
+		const row = await this._exec().get(sql, []);
+		return Number(row?.violations ?? 0);
+	}
 	/**
 	* Live foreign keys referencing `tableName`, via `pg_constraint` — exact for
 	* composite keys (`conkey`/`confkey` are positionally aligned, unlike the
@@ -1349,8 +1379,9 @@ var PostgresAdapter = class PostgresAdapter extends BaseDbAdapter {
 	}
 	/**
 	* `ALTER TABLE … DROP CONSTRAINT <pk>, ADD PRIMARY KEY (…)` in ONE statement
-	* (atomic). Called on an empty table only; `ADD PRIMARY KEY` makes the new
-	* key columns NOT NULL. A demoted identity column is handled by the
+	* (atomic: rows a concurrent write made violate the new key fail it with
+	* the old key in place). Called on an empty table or one whose rows satisfy
+	* the new key; `ADD PRIMARY KEY` makes the new key columns NOT NULL. A demoted identity column is handled by the
 	* `defaultChanged` diff (`DROP IDENTITY`).
 	*/
 	async rebuildPrimaryKey(change) {
@@ -1444,10 +1475,10 @@ var PostgresAdapter = class PostgresAdapter extends BaseDbAdapter {
 			this._log(ddl);
 			await this._exec().exec(ddl);
 		}
-		for (const { field } of diff.typeChanged ?? []) {
+		for (const { field, existingType } of diff.typeChanged ?? []) {
 			const sqlType = this.typeMapper(field);
 			const col = qi(field.physicalName);
-			const ddl = `ALTER TABLE ${quoteTableName(tableName)} ALTER COLUMN ${col} TYPE ${sqlType} USING ${convertColumnExpr(col, field, sqlType)}`;
+			const ddl = `ALTER TABLE ${quoteTableName(tableName)} ALTER COLUMN ${col} TYPE ${sqlType} USING ${convertColumnExpr(col, field, sqlType, existingType)}`;
 			this._log(ddl);
 			await this._exec().exec(ddl);
 		}
@@ -1555,8 +1586,9 @@ var PostgresAdapter = class PostgresAdapter extends BaseDbAdapter {
 				const selectExprs = commonFields.map((field) => {
 					const c = qi(field.physicalName);
 					const sqlType = this.typeMapper(field);
-					const changed = isColumnTypeChanged(oldTypes.get(field.physicalName), sqlType);
-					const value = changed ? convertColumnExpr(c, field, sqlType) : c;
+					const oldType = oldTypes.get(field.physicalName);
+					const changed = isColumnTypeChanged(oldType, sqlType);
+					const value = changed ? convertColumnExpr(c, field, sqlType, oldType) : c;
 					if (!field.optional && !field.isPrimaryKey) return `COALESCE(${value}, ${field.defaultValue?.kind === "value" ? defaultValueToSqlLiteral$1(field.designType, field.defaultValue.value) : defaultValueForType$1(field.designType)}) AS ${c}`;
 					return changed ? `${value} AS ${c}` : c;
 				}).join(", ");
@@ -1673,6 +1705,20 @@ var PostgresAdapter = class PostgresAdapter extends BaseDbAdapter {
 		this._log(ddl);
 		await this._exec().exec(ddl);
 	}
+	async copyFromJsonColumn(source, targets) {
+		const sql = buildJsonColumnCopy(pgDialect, this.resolveTableName(), source, targets, (expr, target) => {
+			if (target.kind !== "text") return expr;
+			const type = this.typeMapper(target.field);
+			return /^(VARCHAR|CHAR)\b/i.test(type) ? expr : `(${expr})::${type}`;
+		});
+		this._log(sql);
+		await this._exec().exec(sql);
+	}
+	async jsonifyTextColumn(column) {
+		const sql = buildJsonifyText(pgDialect, this.resolveTableName(), column);
+		this._log(sql);
+		await this._exec().exec(sql);
+	}
 	async dropColumns(columns) {
 		const tableName = this.resolveTableName();
 		const drops = columns.map((col) => `DROP COLUMN ${qi(col)}`).join(", ");
@@ -2189,6 +2235,8 @@ var PostgresAdapter = class PostgresAdapter extends BaseDbAdapter {
 };
 /** A text / character type: the value is converted by the assignment into the column. */
 const CHARACTER_TYPE = /^\s*(?:text|varchar|character varying|char|character|bpchar)\b/i;
+/** A floating-point / decimal column type (live or mapped). */
+const FRACTIONAL_TYPE = /^\s*(?:double precision|float[48]?|real|numeric|decimal)\b/i;
 /**
 * The expression converting column `col` (quoted) to `sqlType`, the field's
 * new type — one rule for `ALTER COLUMN … TYPE … USING` and the recreate copy.
@@ -2196,11 +2244,19 @@ const CHARACTER_TYPE = /^\s*(?:text|varchar|character varying|char|character|bpc
 * fails the statement instead of being coerced. A TEXT / VARCHAR(n) / CHAR(n)
 * target stops at `::text`: an explicit cast to VARCHAR(n) / CHAR(n) would
 * truncate an over-long value, the assignment into the column rejects it
-* (since 0.1.137).
+* (since 0.1.137). An epoch-ms fractional column (`existingType`) becoming
+* the `BIGINT` of `@db.default.now` (`number.timestamp` →
+* `number.timestamp.created`) is rounded (since 0.1.155): its text
+* (`1700000000123.5`) does not parse as an integer. Any other fractional
+* value still fails a change to an integer type.
 */
-function convertColumnExpr(col, field, sqlType) {
-	if (field.isGeoPoint && sqlType.startsWith("geography")) return `CASE WHEN ${col} IS NULL THEN NULL ELSE ST_SetSRID(ST_MakePoint((${col}->>0)::float8, (${col}->>1)::float8), 4326)::geography END`;
+function convertColumnExpr(col, field, sqlType, existingType) {
+	if (field.isGeoPoint && sqlType.startsWith("geography")) {
+		const json = `${col}::jsonb`;
+		return `CASE WHEN ${col} IS NULL THEN NULL ELSE ST_SetSRID(ST_MakePoint((${json}->>0)::float8, (${json}->>1)::float8), 4326)::geography END`;
+	}
 	if (CHARACTER_TYPE.test(sqlType)) return `${col}::text`;
+	if (field.defaultValue?.kind === "fn" && field.defaultValue.fn === "now" && /^BIGINT$/i.test(sqlType.trim()) && existingType && FRACTIONAL_TYPE.test(existingType)) return `round(${col})::bigint`;
 	return `${col}::text::${sqlType}`;
 }
 /**
@@ -2360,6 +2416,10 @@ function createCustomTypes(pgTypes) {
 		return pgTypes.getTypeParser(oid, format);
 	} };
 }
+/** The warning logged for a pool client whose connection broke (`57P01`, `ECONNRESET`, …). */
+function lostConnectionMessage(err, where) {
+	return `[atscript/db-postgres] ${where} pool connection lost (${err.code ?? err.name}): ${err.message}`;
+}
 /**
 * {@link TPgDriver} implementation backed by `pg` (node-postgres).
 *
@@ -2386,6 +2446,12 @@ function createCustomTypes(pgTypes) {
 * const driver = new PgDriver(pool)
 * ```
 *
+* A broken pool connection (a terminated backend, failover, network reset) is
+* logged through `options.logger` instead of crashing the process (since
+* 0.1.154): idle clients of a pool the driver creates, and clients checked out
+* for a transaction. A pre-created `pg.Pool` is the caller's — attach your own
+* `pool.on('error', …)` listener, or an idle client's error crashes the process.
+*
 * Requires `pg` to be installed:
 * ```bash
 * pnpm add pg
@@ -2394,7 +2460,9 @@ function createCustomTypes(pgTypes) {
 var PgDriver = class {
 	pool;
 	poolInit;
-	constructor(poolOrConfig) {
+	logger;
+	constructor(poolOrConfig, options = {}) {
+		this.logger = options.logger ?? console;
 		if (typeof poolOrConfig === "object" && typeof poolOrConfig.query === "function") this.pool = poolOrConfig;
 		else this.poolInit = import("pg").then((pg) => {
 			const Pool = pg.default?.Pool ?? pg.Pool;
@@ -2408,6 +2476,7 @@ var PgDriver = class {
 				...poolOrConfig,
 				types: customTypes
 			});
+			this.pool.on("error", (err) => this.logger.warn(lostConnectionMessage(err, "idle")));
 			return this.pool;
 		});
 	}
@@ -2432,6 +2501,13 @@ var PgDriver = class {
 	}
 	async getConnection() {
 		const client = await (await this.getPool()).connect();
+		let lost;
+		const onError = (err) => {
+			if (lost) return;
+			lost = err;
+			this.logger.warn(lostConnectionMessage(err, "checked-out"));
+		};
+		client.on("error", onError);
 		return {
 			async run(sql, params) {
 				const result = await client.query(sql, sanitizeParams(params));
@@ -2450,7 +2526,8 @@ var PgDriver = class {
 				await client.query(sql);
 			},
 			release() {
-				client.release();
+				client.removeListener("error", onError);
+				client.release(lost);
 			}
 		};
 	}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atscript/db-postgres",
-  "version": "0.1.153",
+  "version": "0.1.155",
   "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.103",
-    "@atscript/typescript": "^0.1.103",
+    "@atscript/core": "^0.1.105",
+    "@atscript/typescript": "^0.1.105",
     "@types/pg": "^8.11.0",
     "@uniqu/core": "^0.1.15",
     "pg": "^8.13.0",
-    "unplugin-atscript": "^0.1.103"
+    "unplugin-atscript": "^0.1.105"
   },
   "peerDependencies": {
-    "@atscript/core": "^0.1.103",
-    "@atscript/typescript": "^0.1.103",
+    "@atscript/core": "^0.1.105",
+    "@atscript/typescript": "^0.1.105",
     "@uniqu/core": "^0.1.15",
     "pg": ">=8.0.0",
-    "@atscript/db-sql-tools": "^0.1.153",
-    "@atscript/db": "^0.1.153"
+    "@atscript/db": "^0.1.155",
+    "@atscript/db-sql-tools": "^0.1.155"
   },
   "peerDependenciesMeta": {
     "pg": {