@atscript/db-postgres 0.1.136 → 0.1.137

package/dist/index.cjs

@@ -853,15 +853,19 @@ var PostgresAdapter = class PostgresAdapter extends _atscript_db.BaseDbAdapter {
 		return this.getExistingColumnsForTable(this._table.tableName);
 	}
 	async getExistingColumnsForTable(tableName) {
+		return this._readColumns(this._exec(), tableName);
+	}
+	/** Live columns of `tableName`, read through `exec` (the recreate's own connection, or the pool). */
+	async _readColumns(exec, tableName) {
 		const schema = this._schema;
-		const rows = await this._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,
+		const rows = 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,
               format_type(a.atttypid, a.atttypmod) AS formatted_type
        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')
        ORDER BY c.ordinal_position`, [tableName, schema]);
-		const pkRows = await this._exec().all(`SELECT kcu.column_name
+		const pkRows = await exec.all(`SELECT kcu.column_name
        FROM information_schema.table_constraints tc
        JOIN information_schema.key_column_usage kcu
          ON tc.constraint_name = kcu.constraint_name AND tc.table_schema = kcu.table_schema
@@ -914,9 +918,7 @@ var PostgresAdapter = class PostgresAdapter extends _atscript_db.BaseDbAdapter {
 		for (const { field } of diff.typeChanged ?? []) {
 			const sqlType = this.typeMapper(field);
 			const col = qi(field.physicalName);
-			let ddl;
-			if (field.isGeoPoint && sqlType.startsWith("geography")) ddl = `ALTER TABLE ${quoteTableName(tableName)} ALTER COLUMN ${col} TYPE ${sqlType} USING CASE WHEN ${col} IS NULL THEN NULL ELSE ST_SetSRID(ST_MakePoint((${col}->>0)::float8, (${col}->>1)::float8), 4326)::geography END`;
-			else ddl = `ALTER TABLE ${quoteTableName(tableName)} ALTER COLUMN ${col} TYPE ${sqlType} USING ${col}::text::${sqlType}`;
+			const ddl = `ALTER TABLE ${quoteTableName(tableName)} ALTER COLUMN ${col} TYPE ${sqlType} USING ${convertColumnExpr(col, field, sqlType)}`;
 			this._log(ddl);
 			await this._exec().exec(ddl);
 		}
@@ -1017,22 +1019,17 @@ var PostgresAdapter = class PostgresAdapter extends _atscript_db.BaseDbAdapter {
 			});
 			this._log(createSql);
 			await conn.exec(createSql);
-			const oldColRows = await conn.all(`SELECT column_name FROM information_schema.columns
-         WHERE table_name = $1 AND table_schema = COALESCE($2, 'public')
-         ORDER BY ordinal_position`, [this._table.tableName, schema]);
-			const newCols = this._table.fieldDescriptors.filter((f) => !f.ignored).map((f) => f.physicalName);
-			const oldColSet = new Set(oldColRows.map((c) => c.column_name));
-			const commonCols = newCols.filter((c) => oldColSet.has(c));
-			if (commonCols.length > 0) {
-				const fieldsByName = new Map(this._table.fieldDescriptors.map((f) => [f.physicalName, f]));
-				const colNames = commonCols.map((c) => qi(c)).join(", ");
-				const selectExprs = commonCols.map((c) => {
-					const field = fieldsByName.get(c);
-					if (field && !field.optional && !field.isPrimaryKey) {
-						const fallback = field.defaultValue?.kind === "value" ? defaultValueToSqlLiteral(field.designType, field.defaultValue.value) : defaultValueForType(field.designType);
-						return `COALESCE(${qi(c)}, ${fallback}) AS ${qi(c)}`;
-					}
-					return qi(c);
+			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));
+			if (commonFields.length > 0) {
+				const colNames = commonFields.map((f) => qi(f.physicalName)).join(", ");
+				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;
+					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(", ");
 				const copySql = `INSERT INTO ${quoteTableName(tempName)} (${colNames}) SELECT ${selectExprs} FROM ${quoteTableName(tableName)}`;
 				this._log(copySql);
@@ -1553,6 +1550,22 @@ 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;
+/**
+* The expression converting column `col` (quoted) to `sqlType`, the field's
+* new type — one rule for `ALTER COLUMN … TYPE … USING` and the recreate copy.
+* The value goes through text, so one that does not parse as the new type
+* 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).
+*/
+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`;
+	if (CHARACTER_TYPE.test(sqlType)) return `${col}::text`;
+	return `${col}::text::${sqlType}`;
+}
 /**
 * Normalizes PostgreSQL information_schema data_type values
 * to match the format produced by `pgTypeFromField()`.

package/dist/index.d.cts

@@ -188,6 +188,8 @@ declare class PostgresAdapter extends BaseDbAdapter {
   private _ensureView;
   getExistingColumns(): Promise<TExistingColumn[]>;
   getExistingColumnsForTable(tableName: string): Promise<TExistingColumn[]>;
+  /** Live columns of `tableName`, read through `exec` (the recreate's own connection, or the pool). */
+  private _readColumns;
   syncColumns(diff: TColumnDiff): Promise<TSyncColumnResult>;
   recreateTable(): Promise<void>;
   /**

package/dist/index.d.mts

@@ -188,6 +188,8 @@ declare class PostgresAdapter extends BaseDbAdapter {
   private _ensureView;
   getExistingColumns(): Promise<TExistingColumn[]>;
   getExistingColumnsForTable(tableName: string): Promise<TExistingColumn[]>;
+  /** Live columns of `tableName`, read through `exec` (the recreate's own connection, or the pool). */
+  private _readColumns;
   syncColumns(diff: TColumnDiff): Promise<TSyncColumnResult>;
   recreateTable(): Promise<void>;
   /**

package/dist/index.mjs

@@ -1,4 +1,4 @@
-import { ALL_AGGREGATE_FNS, ALL_BUCKET_UNITS, BaseDbAdapter, DbError, DbSpace, bucketTimeZoneUnavailable } from "@atscript/db";
+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 { BUCKET_MAX_INSTANT, BUCKET_MIN_INSTANT } from "@uniqu/core";
@@ -852,15 +852,19 @@ var PostgresAdapter = class PostgresAdapter extends BaseDbAdapter {
 		return this.getExistingColumnsForTable(this._table.tableName);
 	}
 	async getExistingColumnsForTable(tableName) {
+		return this._readColumns(this._exec(), tableName);
+	}
+	/** Live columns of `tableName`, read through `exec` (the recreate's own connection, or the pool). */
+	async _readColumns(exec, tableName) {
 		const schema = this._schema;
-		const rows = await this._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,
+		const rows = 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,
               format_type(a.atttypid, a.atttypmod) AS formatted_type
        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')
        ORDER BY c.ordinal_position`, [tableName, schema]);
-		const pkRows = await this._exec().all(`SELECT kcu.column_name
+		const pkRows = await exec.all(`SELECT kcu.column_name
        FROM information_schema.table_constraints tc
        JOIN information_schema.key_column_usage kcu
          ON tc.constraint_name = kcu.constraint_name AND tc.table_schema = kcu.table_schema
@@ -913,9 +917,7 @@ var PostgresAdapter = class PostgresAdapter extends BaseDbAdapter {
 		for (const { field } of diff.typeChanged ?? []) {
 			const sqlType = this.typeMapper(field);
 			const col = qi(field.physicalName);
-			let ddl;
-			if (field.isGeoPoint && sqlType.startsWith("geography")) ddl = `ALTER TABLE ${quoteTableName(tableName)} ALTER COLUMN ${col} TYPE ${sqlType} USING CASE WHEN ${col} IS NULL THEN NULL ELSE ST_SetSRID(ST_MakePoint((${col}->>0)::float8, (${col}->>1)::float8), 4326)::geography END`;
-			else ddl = `ALTER TABLE ${quoteTableName(tableName)} ALTER COLUMN ${col} TYPE ${sqlType} USING ${col}::text::${sqlType}`;
+			const ddl = `ALTER TABLE ${quoteTableName(tableName)} ALTER COLUMN ${col} TYPE ${sqlType} USING ${convertColumnExpr(col, field, sqlType)}`;
 			this._log(ddl);
 			await this._exec().exec(ddl);
 		}
@@ -1016,22 +1018,17 @@ var PostgresAdapter = class PostgresAdapter extends BaseDbAdapter {
 			});
 			this._log(createSql);
 			await conn.exec(createSql);
-			const oldColRows = await conn.all(`SELECT column_name FROM information_schema.columns
-         WHERE table_name = $1 AND table_schema = COALESCE($2, 'public')
-         ORDER BY ordinal_position`, [this._table.tableName, schema]);
-			const newCols = this._table.fieldDescriptors.filter((f) => !f.ignored).map((f) => f.physicalName);
-			const oldColSet = new Set(oldColRows.map((c) => c.column_name));
-			const commonCols = newCols.filter((c) => oldColSet.has(c));
-			if (commonCols.length > 0) {
-				const fieldsByName = new Map(this._table.fieldDescriptors.map((f) => [f.physicalName, f]));
-				const colNames = commonCols.map((c) => qi(c)).join(", ");
-				const selectExprs = commonCols.map((c) => {
-					const field = fieldsByName.get(c);
-					if (field && !field.optional && !field.isPrimaryKey) {
-						const fallback = field.defaultValue?.kind === "value" ? defaultValueToSqlLiteral$1(field.designType, field.defaultValue.value) : defaultValueForType$1(field.designType);
-						return `COALESCE(${qi(c)}, ${fallback}) AS ${qi(c)}`;
-					}
-					return qi(c);
+			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));
+			if (commonFields.length > 0) {
+				const colNames = commonFields.map((f) => qi(f.physicalName)).join(", ");
+				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;
+					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(", ");
 				const copySql = `INSERT INTO ${quoteTableName(tempName)} (${colNames}) SELECT ${selectExprs} FROM ${quoteTableName(tableName)}`;
 				this._log(copySql);
@@ -1552,6 +1549,22 @@ 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;
+/**
+* The expression converting column `col` (quoted) to `sqlType`, the field's
+* new type — one rule for `ALTER COLUMN … TYPE … USING` and the recreate copy.
+* The value goes through text, so one that does not parse as the new type
+* 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).
+*/
+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`;
+	if (CHARACTER_TYPE.test(sqlType)) return `${col}::text`;
+	return `${col}::text::${sqlType}`;
+}
 /**
 * Normalizes PostgreSQL information_schema data_type values
 * to match the format produced by `pgTypeFromField()`.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atscript/db-postgres",
-  "version": "0.1.136",
+  "version": "0.1.137",
   "description": "PostgreSQL adapter for @atscript/db with pg (node-postgres) driver support.",
   "keywords": [
     "atscript",
@@ -55,8 +55,8 @@
     "@atscript/typescript": "^0.1.92",
     "@uniqu/core": "^0.1.11",
     "pg": ">=8.0.0",
-    "@atscript/db": "^0.1.136",
-    "@atscript/db-sql-tools": "^0.1.136"
+    "@atscript/db": "^0.1.137",
+    "@atscript/db-sql-tools": "^0.1.137"
   },
   "peerDependenciesMeta": {
     "pg": {