@atscript/db-postgres 0.1.105 → 0.1.106

package/dist/index.cjs

@@ -65,11 +65,50 @@ const pgDialect = {
 			params: [pattern]
 		};
 	},
+	geoWithin(quotedCol, circle) {
+		return {
+			sql: `ST_DWithin(${quotedCol}, ST_SetSRID(ST_MakePoint(?, ?), 4326)::geography, ?)`,
+			params: [
+				circle.center[0],
+				circle.center[1],
+				circle.radius
+			]
+		};
+	},
 	createViewPrefix: "CREATE OR REPLACE VIEW",
 	paramPlaceholder(index) {
 		return `$${index}`;
 	}
 };
+/**
+* Distance-in-meters expression from a geography column to a query point.
+* Used as the `distExpr` of the shared geo search builder.
+*/
+function pgGeoDistanceExpr(quotedCol, point) {
+	return {
+		sql: `ST_Distance(${quotedCol}, ST_SetSRID(ST_MakePoint(?, ?), 4326)::geography)`,
+		params: [point[0], point[1]]
+	};
+}
+/** Formats a `[lng, lat]` tuple as EWKT — the text input format for geography params. */
+function geoPointToEwkt(point) {
+	return `SRID=4326;POINT(${point[0]} ${point[1]})`;
+}
+/**
+* Parses a hex-encoded (E)WKB point — the raw wire format the pg driver
+* returns for geography columns — back to a `[lng, lat]` tuple.
+* Returns `undefined` for anything that isn't a WKB point.
+*/
+function parseEwkbPointHex(hex) {
+	if (hex.length < 42 || !/^[0-9A-Fa-f]+$/.test(hex)) return;
+	const buf = Buffer.from(hex, "hex");
+	const littleEndian = buf.readUInt8(0) === 1;
+	const type = littleEndian ? buf.readUInt32LE(1) : buf.readUInt32BE(1);
+	if ((type & 255) !== 1) return;
+	const offset = (type & 536870912) !== 0 ? 9 : 5;
+	if (buf.length < offset + 16) return;
+	return [littleEndian ? buf.readDoubleLE(offset) : buf.readDoubleBE(offset), littleEndian ? buf.readDoubleLE(offset + 8) : buf.readDoubleBE(offset + 8)];
+}
 function buildInsert(table, data) {
 	return (0, _atscript_db_sql_tools.buildInsert)(pgDialect, table, data);
 }
@@ -274,6 +313,8 @@ var PostgresAdapter = class PostgresAdapter extends _atscript_db.BaseDbAdapter {
 	_nocaseColumns = /* @__PURE__ */ new Set();
 	/** Whether citext extension has been provisioned (avoids redundant round-trips). */
 	_citextProvisioned = false;
+	/** Whether the connected PostgreSQL instance has the PostGIS extension. */
+	_supportsGeo;
 	/** Whether the connected PostgreSQL instance has the pgvector extension. */
 	_supportsVector;
 	/** Vector fields: physical field name → { dimensions, similarity, indexName }. */
@@ -371,11 +412,24 @@ var PostgresAdapter = class PostgresAdapter extends _atscript_db.BaseDbAdapter {
 	* invalid for the pgvector `vector` type — it expects bracket-delimited `[1,2,3]`.
 	*/
 	formatValue(field) {
-		if (!this._vectorFields.has(field.path)) return;
-		return {
+		if (this._vectorFields.has(field.path)) return {
 			toStorage: (value) => Array.isArray(value) ? `[${value.join(",")}]` : value,
 			fromStorage: (value) => typeof value === "string" ? JSON.parse(value) : value
 		};
+		if (field.isGeoPoint && !field.encrypted) return {
+			toStorage: (value) => {
+				if (!this._supportsGeo) return value;
+				const point = (0, _atscript_db_sql_tools.normalizeGeoPointValue)(value);
+				return point ? geoPointToEwkt(point) : value;
+			},
+			fromStorage: (value) => {
+				if (typeof value === "string") {
+					const point = parseEwkbPointHex(value);
+					if (point) return point;
+				}
+				return value;
+			}
+		};
 	}
 	/**
 	* Wraps an async write operation to catch PostgreSQL constraint errors
@@ -564,6 +618,14 @@ var PostgresAdapter = class PostgresAdapter extends _atscript_db.BaseDbAdapter {
 		this._log(sql, params);
 		return { deletedCount: (await this._wrapConstraintError(() => this._exec().run(sql, params))).affectedRows };
 	}
+	async prepareTypeMapper() {
+		if (this._supportsVector === void 0 && this._vectorFields.size > 0) await this._detectVectorSupport();
+		if (this._supportsGeo === void 0 && this._hasGeoPointFields()) await this._detectGeoSupport();
+	}
+	/** Whether the table declares any `db.geoPoint` fields (unencrypted). */
+	_hasGeoPointFields() {
+		return this._table.fieldDescriptors.some((fd) => fd.isGeoPoint && !fd.encrypted);
+	}
 	async ensureTable() {
 		if (this._nocaseColumns.size > 0 && !this._citextProvisioned) try {
 			await this._exec().exec("CREATE EXTENSION IF NOT EXISTS citext");
@@ -572,7 +634,8 @@ var PostgresAdapter = class PostgresAdapter extends _atscript_db.BaseDbAdapter {
 			const msg = err instanceof Error ? err.message : String(err);
 			throw new Error(`Failed to create citext extension for @db.collate 'nocase' columns: ${msg}. Either run 'CREATE EXTENSION citext' as a superuser, or use @db.pg.type "CITEXT" after provisioning the extension manually.`, { cause: err });
 		}
-		if (this._supportsVector === void 0 && this._vectorFields.size > 0) await this._detectVectorSupport();
+		await this.prepareTypeMapper();
+		if (this._schema) await this._exec().exec(`CREATE SCHEMA IF NOT EXISTS ${qi(this._schema)}`);
 		if (this._table instanceof _atscript_db.AtscriptDbView) return this._ensureView();
 		const sql = buildCreateTable(this.resolveTableName(), this._table.fieldDescriptors, this._table.foreignKeys, {
 			incrementFields: this._incrementFields,
@@ -653,7 +716,9 @@ var PostgresAdapter = class PostgresAdapter extends _atscript_db.BaseDbAdapter {
 		for (const { field } 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 ${col}::text::${sqlType}`;
+			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}`;
 			this._log(ddl);
 			await this._exec().exec(ddl);
 		}
@@ -814,6 +879,27 @@ var PostgresAdapter = class PostgresAdapter extends _atscript_db.BaseDbAdapter {
 		this._log(ddl);
 		await this._exec().exec(ddl);
 	}
+	async dropIndexesForColumns(columns) {
+		const tableName = this._table.tableName;
+		const schema = this._schema;
+		const rows = await this._exec().all(`SELECT DISTINCT i.relname AS name
+       FROM pg_index x
+       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
+       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')
+         AND i.relname LIKE 'atscript__%' AND a.attname = ANY($3)`, [
+			tableName,
+			schema,
+			columns
+		]);
+		for (const row of rows) {
+			const sql = `DROP INDEX IF EXISTS ${schema ? `${qi(schema)}.` : ""}${qi(row.name)}`;
+			this._log(sql);
+			await this._exec().exec(sql);
+		}
+	}
 	async dropTableByName(tableName) {
 		const ddl = `DROP TABLE IF EXISTS ${quoteTableName(tableName)} CASCADE`;
 		this._log(ddl);
@@ -836,14 +922,29 @@ var PostgresAdapter = class PostgresAdapter extends _atscript_db.BaseDbAdapter {
 			const vec = this._vectorFields.get(field.path);
 			return this._supportsVector ? `vector(${vec.dimensions})` : "JSONB";
 		}
+		if (field.isGeoPoint) return this._supportsGeo ? "geography(Point,4326)" : pgTypeFromField(field);
 		return pgTypeFromField(field);
 	}
 	async syncIndexes() {
 		const tableName = this._table.tableName;
 		const schema = this._schema;
+		await this.prepareTypeMapper();
 		await this.syncIndexesWithDiff({
-			listExisting: async () => this._exec().all(`SELECT indexname AS name FROM pg_indexes
-           WHERE tablename = $1 AND schemaname = COALESCE($2, 'public')`, [tableName, schema]),
+			listExisting: async () => {
+				return (await this._exec().all(`SELECT i.relname AS name,
+                  (SELECT array_agg(a.attname::text ORDER BY k.ord)
+                   FROM unnest(x.indkey) WITH ORDINALITY AS k(attnum, ord)
+                   JOIN pg_attribute a ON a.attrelid = t.oid AND a.attnum = k.attnum
+                   WHERE k.attnum > 0) AS columns
+           FROM pg_index x
+           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) => ({
+					name: r.name,
+					columns: r.columns ?? void 0
+				}));
+			},
 			createIndex: async (index) => {
 				if (index.type === "fulltext") {
 					const tsvectorExpr = this._buildTsvectorExpr(index.fields);
@@ -852,6 +953,16 @@ var PostgresAdapter = class PostgresAdapter extends _atscript_db.BaseDbAdapter {
 					await this._exec().exec(sql);
 					return;
 				}
+				if (index.type === "geo") {
+					if (!this._supportsGeo) {
+						this.logger.warn(`[postgres] geo index "${index.name}" declared but PostGIS is not available — skipped`);
+						return;
+					}
+					const sql = `CREATE INDEX IF NOT EXISTS ${qi(index.key)} ON ${quoteTableName(this.resolveTableName())} USING gist (${qi(index.fields[0].name)})`;
+					this._log(sql);
+					await this._exec().exec(sql);
+					return;
+				}
 				const unique = index.type === "unique" ? "UNIQUE " : "";
 				const cols = index.fields.map((f) => `${qi(f.name)} ${f.sort === "desc" ? "DESC" : "ASC"}`).join(", ");
 				const sql = `CREATE ${unique}INDEX IF NOT EXISTS ${qi(index.key)} ON ${quoteTableName(this.resolveTableName())} (${cols})`;
@@ -862,10 +973,6 @@ var PostgresAdapter = class PostgresAdapter extends _atscript_db.BaseDbAdapter {
 				const sql = `DROP INDEX IF EXISTS ${schema ? `${qi(schema)}.` : ""}${qi(name)}`;
 				this._log(sql);
 				await this._exec().exec(sql);
-			},
-			warnUnsupportedTypes: {
-				adapter: "postgres",
-				types: ["geo"]
 			}
 		});
 		if (this._supportsVector) for (const [field, vec] of this._vectorFields) {
@@ -1114,6 +1221,65 @@ var PostgresAdapter = class PostgresAdapter extends _atscript_db.BaseDbAdapter {
 		if (queryThreshold !== void 0) return queryThreshold;
 		return this._vectorThresholds.get(indexName);
 	}
+	/**
+	* Detects PostGIS support by attempting to enable the extension.
+	* Idempotent — safe to call multiple times.
+	*/
+	async _detectGeoSupport() {
+		if (this._supportsGeo !== void 0) return this._supportsGeo;
+		try {
+			await this._exec().exec("CREATE EXTENSION IF NOT EXISTS postgis");
+			this._supportsGeo = true;
+		} catch {
+			this._supportsGeo = false;
+			this.logger.warn("[postgres] PostGIS extension not available — db.geoPoint fields are stored as JSONB (no geo search).");
+		}
+		return this._supportsGeo;
+	}
+	isGeoSearchable() {
+		return this._supportsGeo === true;
+	}
+	async geoSearch(point, query, indexName) {
+		await this._detectGeoSupport();
+		const { sql, params } = this._buildGeoSearchSelect(this._prepareGeoSearch(point, query, indexName));
+		this._log(sql, params);
+		return (await this._exec().all(sql, params)).map((row) => (0, _atscript_db_sql_tools.renameGeoDistance)(row));
+	}
+	async geoSearchWithCount(point, query, indexName) {
+		await this._detectGeoSupport();
+		const ctx = this._prepareGeoSearch(point, query, indexName);
+		const { sql, params } = this._buildGeoSearchSelect(ctx);
+		const countFrag = (0, _atscript_db_sql_tools.buildGeoSearchCount)(pgDialect, ctx.tableName, ctx.where, ctx.dist, ctx.window);
+		this._log(sql, params);
+		this._log(countFrag.sql, countFrag.params);
+		const [rows, countRow] = await Promise.all([this._exec().all(sql, params), this._exec().get(countFrag.sql, countFrag.params)]);
+		return {
+			data: rows.map((row) => (0, _atscript_db_sql_tools.renameGeoDistance)(row)),
+			count: parseCount(countRow?.cnt)
+		};
+	}
+	/** Resolves the shared parts of a geo search once (column, filter, distance, window). */
+	_prepareGeoSearch(point, query, indexName) {
+		if (!this._supportsGeo) throw new _atscript_db.DbError("GEO_NOT_SUPPORTED", [{
+			path: "",
+			message: "Geo search requires the PostGIS extension"
+		}]);
+		const column = this._resolveGeoColumn(indexName);
+		const controls = query.controls ?? {};
+		return {
+			tableName: this.resolveTableName(),
+			where: buildWhere(query.filter),
+			dist: pgGeoDistanceExpr(qi(column), point),
+			window: (0, _atscript_db_sql_tools.geoWindowFromControls)(controls),
+			controls
+		};
+	}
+	_buildGeoSearchSelect(ctx) {
+		return (0, _atscript_db_sql_tools.buildGeoSearchSelect)(pgDialect, ctx.tableName, ctx.where, ctx.dist, ctx.window, {
+			$limit: ctx.controls.$limit,
+			$skip: ctx.controls.$skip
+		});
+	}
 };
 /**
 * Normalizes PostgreSQL information_schema data_type values
@@ -1138,6 +1304,7 @@ function normalizePgType(dataType, maxLength, numericPrecision, numericScale, ud
 		case "user-defined":
 			if (udtName === "vector") return formattedType;
 			if (udtName === "citext") return "CITEXT";
+			if (udtName === "geography") return formattedType;
 			return udtName?.toUpperCase() ?? "USER-DEFINED";
 		default: return dataType.toUpperCase();
 	}

package/dist/index.d.cts

@@ -95,6 +95,8 @@ declare class PostgresAdapter extends BaseDbAdapter {
   private _nocaseColumns;
   /** Whether citext extension has been provisioned (avoids redundant round-trips). */
   private _citextProvisioned;
+  /** Whether the connected PostgreSQL instance has the PostGIS extension. */
+  private _supportsGeo;
   /** Whether the connected PostgreSQL instance has the pgvector extension. */
   private _supportsVector;
   /** Vector fields: physical field name → { dimensions, similarity, indexName }. */
@@ -151,6 +153,9 @@ declare class PostgresAdapter extends BaseDbAdapter {
   replaceMany(filter: FilterExpr, data: Record<string, unknown>): Promise<TDbUpdateResult>;
   deleteOne(filter: FilterExpr): Promise<TDbDeleteResult>;
   deleteMany(filter: FilterExpr): Promise<TDbDeleteResult>;
+  prepareTypeMapper(): Promise<void>;
+  /** Whether the table declares any `db.geoPoint` fields (unencrypted). */
+  private _hasGeoPointFields;
   ensureTable(): Promise<void>;
   private _ensureView;
   getExistingColumns(): Promise<TExistingColumn[]>;
@@ -168,6 +173,7 @@ declare class PostgresAdapter extends BaseDbAdapter {
   tableExists(): Promise<boolean>;
   dropTable(): Promise<void>;
   dropColumns(columns: string[]): Promise<void>;
+  dropIndexesForColumns(columns: string[]): Promise<void>;
   dropTableByName(tableName: string): Promise<void>;
   dropViewByName(viewName: string): Promise<void>;
   renameTable(oldName: string): Promise<void>;
@@ -204,6 +210,20 @@ declare class PostgresAdapter extends BaseDbAdapter {
   private _buildVectorSearchCountQuery;
   /** Resolves threshold: query-time $threshold > schema-level @db.search.vector.threshold. */
   private _resolveVectorThreshold;
+  /**
+   * Detects PostGIS support by attempting to enable the extension.
+   * Idempotent — safe to call multiple times.
+   */
+  private _detectGeoSupport;
+  isGeoSearchable(): boolean;
+  geoSearch(point: [number, number], query: DbQuery, indexName?: string): Promise<Array<Record<string, unknown>>>;
+  geoSearchWithCount(point: [number, number], query: DbQuery, indexName?: string): Promise<{
+    data: Array<Record<string, unknown>>;
+    count: number;
+  }>;
+  /** Resolves the shared parts of a geo search once (column, filter, distance, window). */
+  private _prepareGeoSearch;
+  private _buildGeoSearchSelect;
 }
 //#endregion
 //#region src/pg-driver.d.ts

package/dist/index.d.mts

@@ -95,6 +95,8 @@ declare class PostgresAdapter extends BaseDbAdapter {
   private _nocaseColumns;
   /** Whether citext extension has been provisioned (avoids redundant round-trips). */
   private _citextProvisioned;
+  /** Whether the connected PostgreSQL instance has the PostGIS extension. */
+  private _supportsGeo;
   /** Whether the connected PostgreSQL instance has the pgvector extension. */
   private _supportsVector;
   /** Vector fields: physical field name → { dimensions, similarity, indexName }. */
@@ -151,6 +153,9 @@ declare class PostgresAdapter extends BaseDbAdapter {
   replaceMany(filter: FilterExpr, data: Record<string, unknown>): Promise<TDbUpdateResult>;
   deleteOne(filter: FilterExpr): Promise<TDbDeleteResult>;
   deleteMany(filter: FilterExpr): Promise<TDbDeleteResult>;
+  prepareTypeMapper(): Promise<void>;
+  /** Whether the table declares any `db.geoPoint` fields (unencrypted). */
+  private _hasGeoPointFields;
   ensureTable(): Promise<void>;
   private _ensureView;
   getExistingColumns(): Promise<TExistingColumn[]>;
@@ -168,6 +173,7 @@ declare class PostgresAdapter extends BaseDbAdapter {
   tableExists(): Promise<boolean>;
   dropTable(): Promise<void>;
   dropColumns(columns: string[]): Promise<void>;
+  dropIndexesForColumns(columns: string[]): Promise<void>;
   dropTableByName(tableName: string): Promise<void>;
   dropViewByName(viewName: string): Promise<void>;
   renameTable(oldName: string): Promise<void>;
@@ -204,6 +210,20 @@ declare class PostgresAdapter extends BaseDbAdapter {
   private _buildVectorSearchCountQuery;
   /** Resolves threshold: query-time $threshold > schema-level @db.search.vector.threshold. */
   private _resolveVectorThreshold;
+  /**
+   * Detects PostGIS support by attempting to enable the extension.
+   * Idempotent — safe to call multiple times.
+   */
+  private _detectGeoSupport;
+  isGeoSearchable(): boolean;
+  geoSearch(point: [number, number], query: DbQuery, indexName?: string): Promise<Array<Record<string, unknown>>>;
+  geoSearchWithCount(point: [number, number], query: DbQuery, indexName?: string): Promise<{
+    data: Array<Record<string, unknown>>;
+    count: number;
+  }>;
+  /** Resolves the shared parts of a geo search once (column, filter, distance, window). */
+  private _prepareGeoSearch;
+  private _buildGeoSearchSelect;
 }
 //#endregion
 //#region src/pg-driver.d.ts

package/dist/index.mjs

@@ -1,5 +1,5 @@
 import { AtscriptDbView, BaseDbAdapter, DbError, DbSpace } from "@atscript/db";
-import { buildAggregateCount, buildAggregateSelect, buildCreateView, buildDelete, buildInsert, buildSelect, buildUpdate, buildWhere as buildWhere$1, defaultValueForType, defaultValueToSqlLiteral, finalizeParams, parseRegexString, refActionToSql } from "@atscript/db-sql-tools";
+import { buildAggregateCount, buildAggregateSelect, buildCreateView, buildDelete, buildGeoSearchCount, buildGeoSearchSelect, buildInsert, buildSelect, buildUpdate, buildWhere as buildWhere$1, defaultValueForType, defaultValueToSqlLiteral, finalizeParams, geoWindowFromControls, normalizeGeoPointValue, parseRegexString, refActionToSql, renameGeoDistance } from "@atscript/db-sql-tools";
 //#region src/sql-builder.ts
 /**
 * PostgreSQL-aware default value for a given design type.
@@ -64,11 +64,50 @@ const pgDialect = {
 			params: [pattern]
 		};
 	},
+	geoWithin(quotedCol, circle) {
+		return {
+			sql: `ST_DWithin(${quotedCol}, ST_SetSRID(ST_MakePoint(?, ?), 4326)::geography, ?)`,
+			params: [
+				circle.center[0],
+				circle.center[1],
+				circle.radius
+			]
+		};
+	},
 	createViewPrefix: "CREATE OR REPLACE VIEW",
 	paramPlaceholder(index) {
 		return `$${index}`;
 	}
 };
+/**
+* Distance-in-meters expression from a geography column to a query point.
+* Used as the `distExpr` of the shared geo search builder.
+*/
+function pgGeoDistanceExpr(quotedCol, point) {
+	return {
+		sql: `ST_Distance(${quotedCol}, ST_SetSRID(ST_MakePoint(?, ?), 4326)::geography)`,
+		params: [point[0], point[1]]
+	};
+}
+/** Formats a `[lng, lat]` tuple as EWKT — the text input format for geography params. */
+function geoPointToEwkt(point) {
+	return `SRID=4326;POINT(${point[0]} ${point[1]})`;
+}
+/**
+* Parses a hex-encoded (E)WKB point — the raw wire format the pg driver
+* returns for geography columns — back to a `[lng, lat]` tuple.
+* Returns `undefined` for anything that isn't a WKB point.
+*/
+function parseEwkbPointHex(hex) {
+	if (hex.length < 42 || !/^[0-9A-Fa-f]+$/.test(hex)) return;
+	const buf = Buffer.from(hex, "hex");
+	const littleEndian = buf.readUInt8(0) === 1;
+	const type = littleEndian ? buf.readUInt32LE(1) : buf.readUInt32BE(1);
+	if ((type & 255) !== 1) return;
+	const offset = (type & 536870912) !== 0 ? 9 : 5;
+	if (buf.length < offset + 16) return;
+	return [littleEndian ? buf.readDoubleLE(offset) : buf.readDoubleBE(offset), littleEndian ? buf.readDoubleLE(offset + 8) : buf.readDoubleBE(offset + 8)];
+}
 function buildInsert$1(table, data) {
 	return buildInsert(pgDialect, table, data);
 }
@@ -273,6 +312,8 @@ var PostgresAdapter = class PostgresAdapter extends BaseDbAdapter {
 	_nocaseColumns = /* @__PURE__ */ new Set();
 	/** Whether citext extension has been provisioned (avoids redundant round-trips). */
 	_citextProvisioned = false;
+	/** Whether the connected PostgreSQL instance has the PostGIS extension. */
+	_supportsGeo;
 	/** Whether the connected PostgreSQL instance has the pgvector extension. */
 	_supportsVector;
 	/** Vector fields: physical field name → { dimensions, similarity, indexName }. */
@@ -370,11 +411,24 @@ var PostgresAdapter = class PostgresAdapter extends BaseDbAdapter {
 	* invalid for the pgvector `vector` type — it expects bracket-delimited `[1,2,3]`.
 	*/
 	formatValue(field) {
-		if (!this._vectorFields.has(field.path)) return;
-		return {
+		if (this._vectorFields.has(field.path)) return {
 			toStorage: (value) => Array.isArray(value) ? `[${value.join(",")}]` : value,
 			fromStorage: (value) => typeof value === "string" ? JSON.parse(value) : value
 		};
+		if (field.isGeoPoint && !field.encrypted) return {
+			toStorage: (value) => {
+				if (!this._supportsGeo) return value;
+				const point = normalizeGeoPointValue(value);
+				return point ? geoPointToEwkt(point) : value;
+			},
+			fromStorage: (value) => {
+				if (typeof value === "string") {
+					const point = parseEwkbPointHex(value);
+					if (point) return point;
+				}
+				return value;
+			}
+		};
 	}
 	/**
 	* Wraps an async write operation to catch PostgreSQL constraint errors
@@ -563,6 +617,14 @@ var PostgresAdapter = class PostgresAdapter extends BaseDbAdapter {
 		this._log(sql, params);
 		return { deletedCount: (await this._wrapConstraintError(() => this._exec().run(sql, params))).affectedRows };
 	}
+	async prepareTypeMapper() {
+		if (this._supportsVector === void 0 && this._vectorFields.size > 0) await this._detectVectorSupport();
+		if (this._supportsGeo === void 0 && this._hasGeoPointFields()) await this._detectGeoSupport();
+	}
+	/** Whether the table declares any `db.geoPoint` fields (unencrypted). */
+	_hasGeoPointFields() {
+		return this._table.fieldDescriptors.some((fd) => fd.isGeoPoint && !fd.encrypted);
+	}
 	async ensureTable() {
 		if (this._nocaseColumns.size > 0 && !this._citextProvisioned) try {
 			await this._exec().exec("CREATE EXTENSION IF NOT EXISTS citext");
@@ -571,7 +633,8 @@ var PostgresAdapter = class PostgresAdapter extends BaseDbAdapter {
 			const msg = err instanceof Error ? err.message : String(err);
 			throw new Error(`Failed to create citext extension for @db.collate 'nocase' columns: ${msg}. Either run 'CREATE EXTENSION citext' as a superuser, or use @db.pg.type "CITEXT" after provisioning the extension manually.`, { cause: err });
 		}
-		if (this._supportsVector === void 0 && this._vectorFields.size > 0) await this._detectVectorSupport();
+		await this.prepareTypeMapper();
+		if (this._schema) await this._exec().exec(`CREATE SCHEMA IF NOT EXISTS ${qi(this._schema)}`);
 		if (this._table instanceof AtscriptDbView) return this._ensureView();
 		const sql = buildCreateTable(this.resolveTableName(), this._table.fieldDescriptors, this._table.foreignKeys, {
 			incrementFields: this._incrementFields,
@@ -652,7 +715,9 @@ var PostgresAdapter = class PostgresAdapter extends BaseDbAdapter {
 		for (const { field } 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 ${col}::text::${sqlType}`;
+			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}`;
 			this._log(ddl);
 			await this._exec().exec(ddl);
 		}
@@ -813,6 +878,27 @@ var PostgresAdapter = class PostgresAdapter extends BaseDbAdapter {
 		this._log(ddl);
 		await this._exec().exec(ddl);
 	}
+	async dropIndexesForColumns(columns) {
+		const tableName = this._table.tableName;
+		const schema = this._schema;
+		const rows = await this._exec().all(`SELECT DISTINCT i.relname AS name
+       FROM pg_index x
+       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
+       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')
+         AND i.relname LIKE 'atscript__%' AND a.attname = ANY($3)`, [
+			tableName,
+			schema,
+			columns
+		]);
+		for (const row of rows) {
+			const sql = `DROP INDEX IF EXISTS ${schema ? `${qi(schema)}.` : ""}${qi(row.name)}`;
+			this._log(sql);
+			await this._exec().exec(sql);
+		}
+	}
 	async dropTableByName(tableName) {
 		const ddl = `DROP TABLE IF EXISTS ${quoteTableName(tableName)} CASCADE`;
 		this._log(ddl);
@@ -835,14 +921,29 @@ var PostgresAdapter = class PostgresAdapter extends BaseDbAdapter {
 			const vec = this._vectorFields.get(field.path);
 			return this._supportsVector ? `vector(${vec.dimensions})` : "JSONB";
 		}
+		if (field.isGeoPoint) return this._supportsGeo ? "geography(Point,4326)" : pgTypeFromField(field);
 		return pgTypeFromField(field);
 	}
 	async syncIndexes() {
 		const tableName = this._table.tableName;
 		const schema = this._schema;
+		await this.prepareTypeMapper();
 		await this.syncIndexesWithDiff({
-			listExisting: async () => this._exec().all(`SELECT indexname AS name FROM pg_indexes
-           WHERE tablename = $1 AND schemaname = COALESCE($2, 'public')`, [tableName, schema]),
+			listExisting: async () => {
+				return (await this._exec().all(`SELECT i.relname AS name,
+                  (SELECT array_agg(a.attname::text ORDER BY k.ord)
+                   FROM unnest(x.indkey) WITH ORDINALITY AS k(attnum, ord)
+                   JOIN pg_attribute a ON a.attrelid = t.oid AND a.attnum = k.attnum
+                   WHERE k.attnum > 0) AS columns
+           FROM pg_index x
+           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) => ({
+					name: r.name,
+					columns: r.columns ?? void 0
+				}));
+			},
 			createIndex: async (index) => {
 				if (index.type === "fulltext") {
 					const tsvectorExpr = this._buildTsvectorExpr(index.fields);
@@ -851,6 +952,16 @@ var PostgresAdapter = class PostgresAdapter extends BaseDbAdapter {
 					await this._exec().exec(sql);
 					return;
 				}
+				if (index.type === "geo") {
+					if (!this._supportsGeo) {
+						this.logger.warn(`[postgres] geo index "${index.name}" declared but PostGIS is not available — skipped`);
+						return;
+					}
+					const sql = `CREATE INDEX IF NOT EXISTS ${qi(index.key)} ON ${quoteTableName(this.resolveTableName())} USING gist (${qi(index.fields[0].name)})`;
+					this._log(sql);
+					await this._exec().exec(sql);
+					return;
+				}
 				const unique = index.type === "unique" ? "UNIQUE " : "";
 				const cols = index.fields.map((f) => `${qi(f.name)} ${f.sort === "desc" ? "DESC" : "ASC"}`).join(", ");
 				const sql = `CREATE ${unique}INDEX IF NOT EXISTS ${qi(index.key)} ON ${quoteTableName(this.resolveTableName())} (${cols})`;
@@ -861,10 +972,6 @@ var PostgresAdapter = class PostgresAdapter extends BaseDbAdapter {
 				const sql = `DROP INDEX IF EXISTS ${schema ? `${qi(schema)}.` : ""}${qi(name)}`;
 				this._log(sql);
 				await this._exec().exec(sql);
-			},
-			warnUnsupportedTypes: {
-				adapter: "postgres",
-				types: ["geo"]
 			}
 		});
 		if (this._supportsVector) for (const [field, vec] of this._vectorFields) {
@@ -1113,6 +1220,65 @@ var PostgresAdapter = class PostgresAdapter extends BaseDbAdapter {
 		if (queryThreshold !== void 0) return queryThreshold;
 		return this._vectorThresholds.get(indexName);
 	}
+	/**
+	* Detects PostGIS support by attempting to enable the extension.
+	* Idempotent — safe to call multiple times.
+	*/
+	async _detectGeoSupport() {
+		if (this._supportsGeo !== void 0) return this._supportsGeo;
+		try {
+			await this._exec().exec("CREATE EXTENSION IF NOT EXISTS postgis");
+			this._supportsGeo = true;
+		} catch {
+			this._supportsGeo = false;
+			this.logger.warn("[postgres] PostGIS extension not available — db.geoPoint fields are stored as JSONB (no geo search).");
+		}
+		return this._supportsGeo;
+	}
+	isGeoSearchable() {
+		return this._supportsGeo === true;
+	}
+	async geoSearch(point, query, indexName) {
+		await this._detectGeoSupport();
+		const { sql, params } = this._buildGeoSearchSelect(this._prepareGeoSearch(point, query, indexName));
+		this._log(sql, params);
+		return (await this._exec().all(sql, params)).map((row) => renameGeoDistance(row));
+	}
+	async geoSearchWithCount(point, query, indexName) {
+		await this._detectGeoSupport();
+		const ctx = this._prepareGeoSearch(point, query, indexName);
+		const { sql, params } = this._buildGeoSearchSelect(ctx);
+		const countFrag = buildGeoSearchCount(pgDialect, ctx.tableName, ctx.where, ctx.dist, ctx.window);
+		this._log(sql, params);
+		this._log(countFrag.sql, countFrag.params);
+		const [rows, countRow] = await Promise.all([this._exec().all(sql, params), this._exec().get(countFrag.sql, countFrag.params)]);
+		return {
+			data: rows.map((row) => renameGeoDistance(row)),
+			count: parseCount(countRow?.cnt)
+		};
+	}
+	/** Resolves the shared parts of a geo search once (column, filter, distance, window). */
+	_prepareGeoSearch(point, query, indexName) {
+		if (!this._supportsGeo) throw new DbError("GEO_NOT_SUPPORTED", [{
+			path: "",
+			message: "Geo search requires the PostGIS extension"
+		}]);
+		const column = this._resolveGeoColumn(indexName);
+		const controls = query.controls ?? {};
+		return {
+			tableName: this.resolveTableName(),
+			where: buildWhere(query.filter),
+			dist: pgGeoDistanceExpr(qi(column), point),
+			window: geoWindowFromControls(controls),
+			controls
+		};
+	}
+	_buildGeoSearchSelect(ctx) {
+		return buildGeoSearchSelect(pgDialect, ctx.tableName, ctx.where, ctx.dist, ctx.window, {
+			$limit: ctx.controls.$limit,
+			$skip: ctx.controls.$skip
+		});
+	}
 };
 /**
 * Normalizes PostgreSQL information_schema data_type values
@@ -1137,6 +1303,7 @@ function normalizePgType(dataType, maxLength, numericPrecision, numericScale, ud
 		case "user-defined":
 			if (udtName === "vector") return formattedType;
 			if (udtName === "citext") return "CITEXT";
+			if (udtName === "geography") return formattedType;
 			return udtName?.toUpperCase() ?? "USER-DEFINED";
 		default: return dataType.toUpperCase();
 	}

package/package.json

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