@atscript/db-mysql 0.1.105 → 0.1.106

package/dist/index.cjs

@@ -39,9 +39,53 @@ const mysqlDialect = {
 			params: [pattern]
 		};
 	},
+	geoWithin(quotedCol, circle) {
+		const dist = mysqlGeoDistanceExpr(quotedCol, circle.center);
+		return {
+			sql: `${dist.sql} <= ?`,
+			params: [...dist.params, circle.radius]
+		};
+	},
 	createViewPrefix: "CREATE OR REPLACE VIEW"
 };
 /**
+* Spherical distance in meters from a POINT column to a query point.
+* Used as the `distExpr` of the shared geo search builder.
+*/
+function mysqlGeoDistanceExpr(quotedCol, point) {
+	return {
+		sql: `ST_Distance_Sphere(${quotedCol}, ST_SRID(POINT(?, ?), 4326))`,
+		params: [point[0], point[1]]
+	};
+}
+/**
+* Encodes a `[lng, lat]` tuple in MySQL's internal geometry format
+* (4-byte SRID LE + WKB point) — geometry columns accept it directly as a
+* binary parameter, bypassing the WKT/WKB axis-order pitfalls entirely.
+*/
+function geoPointToMysqlInternal(point) {
+	const buf = Buffer.alloc(25);
+	buf.writeUInt32LE(4326, 0);
+	buf.writeUInt8(1, 4);
+	buf.writeUInt32LE(1, 5);
+	buf.writeDoubleLE(point[0], 9);
+	buf.writeDoubleLE(point[1], 17);
+	return buf;
+}
+/**
+* Decodes a geo read value back to `[lng, lat]`. The mysql2 driver parses
+* POINT columns to `{x, y}` objects (internal order: x=lng, y=lat); raw
+* internal-format buffers are handled for drivers that don't.
+*/
+function mysqlGeoValueToPoint(value) {
+	if (typeof value === "object" && value !== null && typeof value.x === "number" && typeof value.y === "number") return [value.x, value.y];
+	if (value instanceof Uint8Array && value.length >= 25) {
+		const buf = Buffer.isBuffer(value) ? value : Buffer.from(value);
+		const littleEndian = buf.readUInt8(4) === 1;
+		if (((littleEndian ? buf.readUInt32LE(5) : buf.readUInt32BE(5)) & 255) === 1) return [littleEndian ? buf.readDoubleLE(9) : buf.readDoubleBE(9), littleEndian ? buf.readDoubleLE(17) : buf.readDoubleBE(17)];
+	}
+}
+/**
 * Builds an INSERT statement.
 */
 function buildInsert(table, data) {
@@ -121,6 +165,7 @@ function mysqlTypeFromField(field) {
 	const metadata = field.type?.metadata;
 	const mysqlTypeOverride = metadata?.get("db.mysql.type");
 	if (mysqlTypeOverride) return mysqlTypeOverride;
+	if (field.isGeoPoint && !field.encrypted) return "POINT SRID 4326";
 	const unsigned = metadata?.has("db.mysql.unsigned") ?? false;
 	const precision = metadata?.get("db.column.precision");
 	switch (field.designType) {
@@ -409,6 +454,13 @@ var MysqlAdapter = class MysqlAdapter extends _atscript_db.BaseDbAdapter {
 			toStorage: (value) => typeof value === "number" ? epochMsToUtcDatetime(value) : value,
 			fromStorage: utcDatetimeToEpochMs
 		};
+		if (field.isGeoPoint && !field.encrypted) return {
+			toStorage: (value) => {
+				const point = (0, _atscript_db_sql_tools.normalizeGeoPointValue)(value);
+				return point ? geoPointToMysqlInternal(point) : value;
+			},
+			fromStorage: (value) => mysqlGeoValueToPoint(value) ?? value
+		};
 	}
 	/**
 	* Wraps an async write operation to catch MySQL constraint errors
@@ -578,8 +630,11 @@ var MysqlAdapter = class MysqlAdapter extends _atscript_db.BaseDbAdapter {
 		this._log(sql, params);
 		return { deletedCount: (await this._wrapConstraintError(() => this._exec().run(sql, params))).affectedRows };
 	}
-	async ensureTable() {
+	async prepareTypeMapper() {
 		if (this._supportsVector === void 0 && this._vectorFields.size > 0) await this._detectVectorSupport();
+	}
+	async ensureTable() {
+		await this.prepareTypeMapper();
 		if (this._table instanceof _atscript_db.AtscriptDbView) return this._ensureView();
 		const sql = buildCreateTable(this.resolveTableName(), this._table.fieldDescriptors, this._table.foreignKeys, {
 			engine: this._engine,
@@ -603,12 +658,12 @@ var MysqlAdapter = class MysqlAdapter extends _atscript_db.BaseDbAdapter {
 	}
 	async getExistingColumnsForTable(tableName) {
 		const schema = this._schema;
-		return (await this._exec().all(`SELECT COLUMN_NAME, COLUMN_TYPE, IS_NULLABLE, COLUMN_KEY, COLUMN_DEFAULT
+		return (await this._exec().all(`SELECT COLUMN_NAME, COLUMN_TYPE, IS_NULLABLE, COLUMN_KEY, COLUMN_DEFAULT, SRS_ID
        FROM INFORMATION_SCHEMA.COLUMNS
        WHERE TABLE_NAME = ? AND TABLE_SCHEMA = COALESCE(?, DATABASE())
        ORDER BY ORDINAL_POSITION`, [tableName, schema])).map((r) => ({
 			name: r.COLUMN_NAME,
-			type: r.COLUMN_TYPE.toUpperCase(),
+			type: r.SRS_ID == null ? r.COLUMN_TYPE.toUpperCase() : `${r.COLUMN_TYPE.toUpperCase()} SRID ${r.SRS_ID}`,
 			notnull: r.IS_NULLABLE === "NO",
 			pk: r.COLUMN_KEY === "PRI",
 			dflt_value: normalizeMysqlDefault(r.COLUMN_DEFAULT)
@@ -629,7 +684,7 @@ var MysqlAdapter = class MysqlAdapter extends _atscript_db.BaseDbAdapter {
 			let ddl = `ALTER TABLE ${quoteTableName(tableName)} ADD COLUMN ${qi(field.physicalName)} ${sqlType}`;
 			if (!field.optional && !field.isPrimaryKey) ddl += " NOT NULL";
 			if (field.defaultValue?.kind === "value") ddl += ` DEFAULT ${(0, _atscript_db_sql_tools.defaultValueToSqlLiteral)(field.designType, field.defaultValue.value)}`;
-			else if (!field.optional && !field.isPrimaryKey) ddl += ` DEFAULT ${(0, _atscript_db_sql_tools.defaultValueForType)(field.designType)}`;
+			else if (!field.optional && !field.isPrimaryKey) ddl += field.isGeoPoint && !field.encrypted ? ` DEFAULT (ST_SRID(POINT(0, 0), 4326))` : ` DEFAULT ${(0, _atscript_db_sql_tools.defaultValueForType)(field.designType)}`;
 			if (field.collate) {
 				const nativeCollate = field.type?.metadata?.get("db.mysql.collate");
 				ddl += ` COLLATE ${nativeCollate ?? collationToMysql(field.collate)}`;
@@ -640,6 +695,10 @@ var MysqlAdapter = class MysqlAdapter extends _atscript_db.BaseDbAdapter {
 		}
 		for (const { field } of diff.typeChanged ?? []) {
 			const sqlType = this.typeMapper(field);
+			if (field.isGeoPoint && !field.encrypted && sqlType.startsWith("POINT")) {
+				await this._migrateJsonColumnToPoint(tableName, field);
+				continue;
+			}
 			let ddl = `ALTER TABLE ${quoteTableName(tableName)} MODIFY COLUMN ${qi(field.physicalName)} ${sqlType}`;
 			if (!field.optional && !field.isPrimaryKey) ddl += " NOT NULL";
 			this._log(ddl);
@@ -726,6 +785,21 @@ var MysqlAdapter = class MysqlAdapter extends _atscript_db.BaseDbAdapter {
 		this._log(ddl);
 		await this._exec().exec(ddl);
 	}
+	async dropIndexesForColumns(columns) {
+		const placeholders = columns.map(() => "?").join(", ");
+		const rows = await this._exec().all(`SELECT DISTINCT INDEX_NAME AS name FROM INFORMATION_SCHEMA.STATISTICS
+       WHERE TABLE_NAME = ? AND TABLE_SCHEMA = COALESCE(?, DATABASE())
+         AND INDEX_NAME LIKE 'atscript\\_\\_%' AND COLUMN_NAME IN (${placeholders})`, [
+			this._table.tableName,
+			this._schema,
+			...columns
+		]);
+		for (const row of rows) {
+			const sql = `DROP INDEX ${qi(row.name)} ON ${quoteTableName(this.resolveTableName())}`;
+			this._log(sql);
+			await this._exec().exec(sql);
+		}
+	}
 	async dropTableByName(tableName) {
 		const ddl = `DROP TABLE IF EXISTS ${quoteTableName(tableName)}`;
 		this._log(ddl);
@@ -762,9 +836,28 @@ var MysqlAdapter = class MysqlAdapter extends _atscript_db.BaseDbAdapter {
 		const schema = this._schema;
 		const stringFields = new Set(this._table.fieldDescriptors.filter((f) => f.designType === "string").map((f) => f.physicalName));
 		await this.syncIndexesWithDiff({
-			listExisting: async () => this._exec().all(`SELECT DISTINCT INDEX_NAME as name FROM INFORMATION_SCHEMA.STATISTICS
-           WHERE TABLE_NAME = ? AND TABLE_SCHEMA = COALESCE(?, DATABASE())`, [tableName, schema]),
+			listExisting: async () => {
+				return (await this._exec().all(`SELECT INDEX_NAME AS name,
+                  GROUP_CONCAT(COLUMN_NAME ORDER BY SEQ_IN_INDEX SEPARATOR ',') AS columns
+           FROM INFORMATION_SCHEMA.STATISTICS
+           WHERE TABLE_NAME = ? AND TABLE_SCHEMA = COALESCE(?, DATABASE())
+           GROUP BY INDEX_NAME`, [tableName, schema])).map((r) => ({
+					name: r.name,
+					columns: r.columns ? r.columns.split(",") : void 0
+				}));
+			},
 			createIndex: async (index) => {
+				if (index.type === "geo") {
+					const fieldMeta = this._table.fieldDescriptors.find((f) => f.physicalName === index.fields[0]?.name);
+					if (fieldMeta?.optional) {
+						this.logger.warn(`[mysql] geo index "${index.name}" skipped — SPATIAL indexes require a NOT NULL column; make "${fieldMeta.path}" required to index it`);
+						return;
+					}
+					const sql = `CREATE SPATIAL INDEX ${qi(index.key)} ON ${quoteTableName(this.resolveTableName())} (${qi(index.fields[0].name)})`;
+					this._log(sql);
+					await this._exec().exec(sql);
+					return;
+				}
 				const unique = index.type === "unique" ? "UNIQUE " : "";
 				const fulltext = index.type === "fulltext" ? "FULLTEXT " : "";
 				const isFulltext = index.type === "fulltext";
@@ -779,10 +872,6 @@ var MysqlAdapter = class MysqlAdapter extends _atscript_db.BaseDbAdapter {
 				const sql = `DROP INDEX ${qi(name)} ON ${quoteTableName(this.resolveTableName())}`;
 				this._log(sql);
 				await this._exec().exec(sql);
-			},
-			warnUnsupportedTypes: {
-				adapter: "mysql",
-				types: ["geo"]
 			}
 		});
 	}
@@ -1009,6 +1098,65 @@ var MysqlAdapter = class MysqlAdapter extends _atscript_db.BaseDbAdapter {
 		if (queryThreshold !== void 0) return queryThreshold;
 		return this._vectorThresholds.get(indexName);
 	}
+	/** Native POINT SRID 4326 + ST_Distance_Sphere — available on MySQL 8.0+. */
+	isGeoSearchable() {
+		return true;
+	}
+	async geoSearch(point, query, indexName) {
+		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) {
+		const ctx = this._prepareGeoSearch(point, query, indexName);
+		const { sql, params } = this._buildGeoSearchSelect(ctx);
+		const countFrag = (0, _atscript_db_sql_tools.buildGeoSearchCount)(mysqlDialect, 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: Number(countRow?.cnt ?? 0)
+		};
+	}
+	/** Resolves the shared parts of a geo search once (column, filter, distance, window). */
+	_prepareGeoSearch(point, query, indexName) {
+		const column = this._resolveGeoColumn(indexName);
+		const controls = query.controls ?? {};
+		return {
+			tableName: this.resolveTableName(),
+			where: buildWhere(query.filter),
+			dist: mysqlGeoDistanceExpr(qi(column), point),
+			window: (0, _atscript_db_sql_tools.geoWindowFromControls)(controls),
+			controls
+		};
+	}
+	_buildGeoSearchSelect(ctx) {
+		return (0, _atscript_db_sql_tools.buildGeoSearchSelect)(mysqlDialect, ctx.tableName, ctx.where, ctx.dist, ctx.window, {
+			$limit: ctx.controls.$limit,
+			$skip: ctx.controls.$skip
+		});
+	}
+	/**
+	* Migrates a v1 JSON `[lng, lat]` column to native `POINT SRID 4326` via a
+	* temp column (MySQL has no JSON→geometry cast for MODIFY COLUMN).
+	*/
+	async _migrateJsonColumnToPoint(tableName, field) {
+		const col = qi(field.physicalName);
+		const tmp = qi(`${field.physicalName}__geo_mig`);
+		const quotedTable = quoteTableName(tableName);
+		const steps = [
+			`ALTER TABLE ${quotedTable} ADD COLUMN ${tmp} POINT SRID 4326 NULL`,
+			`UPDATE ${quotedTable} SET ${tmp} = ST_SRID(POINT(CAST(${col}->>'$[0]' AS DOUBLE), CAST(${col}->>'$[1]' AS DOUBLE)), 4326) WHERE ${col} IS NOT NULL`,
+			`ALTER TABLE ${quotedTable} DROP COLUMN ${col}`,
+			`ALTER TABLE ${quotedTable} RENAME COLUMN ${tmp} TO ${col}`,
+			...field.optional || field.isPrimaryKey ? [] : [`ALTER TABLE ${quotedTable} MODIFY COLUMN ${col} POINT SRID 4326 NOT NULL`]
+		];
+		for (const ddl of steps) {
+			this._log(ddl);
+			await this._exec().exec(ddl);
+		}
+	}
 };
 /**
 * Normalizes MySQL INFORMATION_SCHEMA.COLUMNS.COLUMN_DEFAULT values

package/dist/index.d.cts

@@ -157,6 +157,7 @@ declare class MysqlAdapter extends BaseDbAdapter {
   replaceMany(filter: FilterExpr, data: Record<string, unknown>): Promise<TDbUpdateResult>;
   deleteOne(filter: FilterExpr): Promise<TDbDeleteResult>;
   deleteMany(filter: FilterExpr): Promise<TDbDeleteResult>;
+  prepareTypeMapper(): Promise<void>;
   ensureTable(): Promise<void>;
   private _ensureView;
   getExistingColumns(): Promise<TExistingColumn[]>;
@@ -165,6 +166,7 @@ declare class MysqlAdapter extends BaseDbAdapter {
   recreateTable(): Promise<void>;
   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>;
@@ -200,6 +202,21 @@ declare class MysqlAdapter extends BaseDbAdapter {
   private _buildVectorSearchCountQuery;
   /** Resolves threshold: query-time $threshold > schema-level @db.search.vector.threshold. */
   private _resolveVectorThreshold;
+  /** Native POINT SRID 4326 + ST_Distance_Sphere — available on MySQL 8.0+. */
+  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;
+  /**
+   * Migrates a v1 JSON `[lng, lat]` column to native `POINT SRID 4326` via a
+   * temp column (MySQL has no JSON→geometry cast for MODIFY COLUMN).
+   */
+  private _migrateJsonColumnToPoint;
 }
 //#endregion
 //#region src/mysql2-driver.d.ts

package/dist/index.d.mts

@@ -157,6 +157,7 @@ declare class MysqlAdapter extends BaseDbAdapter {
   replaceMany(filter: FilterExpr, data: Record<string, unknown>): Promise<TDbUpdateResult>;
   deleteOne(filter: FilterExpr): Promise<TDbDeleteResult>;
   deleteMany(filter: FilterExpr): Promise<TDbDeleteResult>;
+  prepareTypeMapper(): Promise<void>;
   ensureTable(): Promise<void>;
   private _ensureView;
   getExistingColumns(): Promise<TExistingColumn[]>;
@@ -165,6 +166,7 @@ declare class MysqlAdapter extends BaseDbAdapter {
   recreateTable(): Promise<void>;
   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>;
@@ -200,6 +202,21 @@ declare class MysqlAdapter extends BaseDbAdapter {
   private _buildVectorSearchCountQuery;
   /** Resolves threshold: query-time $threshold > schema-level @db.search.vector.threshold. */
   private _resolveVectorThreshold;
+  /** Native POINT SRID 4326 + ST_Distance_Sphere — available on MySQL 8.0+. */
+  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;
+  /**
+   * Migrates a v1 JSON `[lng, lat]` column to native `POINT SRID 4326` via a
+   * temp column (MySQL has no JSON→geometry cast for MODIFY COLUMN).
+   */
+  private _migrateJsonColumnToPoint;
 }
 //#endregion
 //#region src/mysql2-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, parseRegexString, refActionToSql, toSqlValue } from "@atscript/db-sql-tools";
+import { buildAggregateCount, buildAggregateSelect, buildCreateView, buildDelete, buildGeoSearchCount, buildGeoSearchSelect, buildInsert, buildSelect, buildUpdate, buildWhere as buildWhere$1, defaultValueForType, defaultValueToSqlLiteral, geoWindowFromControls, normalizeGeoPointValue, parseRegexString, refActionToSql, renameGeoDistance, toSqlValue } from "@atscript/db-sql-tools";
 //#region src/sql-builder.ts
 /** Escapes a MySQL identifier by doubling backticks. */
 function esc(name) {
@@ -38,9 +38,53 @@ const mysqlDialect = {
 			params: [pattern]
 		};
 	},
+	geoWithin(quotedCol, circle) {
+		const dist = mysqlGeoDistanceExpr(quotedCol, circle.center);
+		return {
+			sql: `${dist.sql} <= ?`,
+			params: [...dist.params, circle.radius]
+		};
+	},
 	createViewPrefix: "CREATE OR REPLACE VIEW"
 };
 /**
+* Spherical distance in meters from a POINT column to a query point.
+* Used as the `distExpr` of the shared geo search builder.
+*/
+function mysqlGeoDistanceExpr(quotedCol, point) {
+	return {
+		sql: `ST_Distance_Sphere(${quotedCol}, ST_SRID(POINT(?, ?), 4326))`,
+		params: [point[0], point[1]]
+	};
+}
+/**
+* Encodes a `[lng, lat]` tuple in MySQL's internal geometry format
+* (4-byte SRID LE + WKB point) — geometry columns accept it directly as a
+* binary parameter, bypassing the WKT/WKB axis-order pitfalls entirely.
+*/
+function geoPointToMysqlInternal(point) {
+	const buf = Buffer.alloc(25);
+	buf.writeUInt32LE(4326, 0);
+	buf.writeUInt8(1, 4);
+	buf.writeUInt32LE(1, 5);
+	buf.writeDoubleLE(point[0], 9);
+	buf.writeDoubleLE(point[1], 17);
+	return buf;
+}
+/**
+* Decodes a geo read value back to `[lng, lat]`. The mysql2 driver parses
+* POINT columns to `{x, y}` objects (internal order: x=lng, y=lat); raw
+* internal-format buffers are handled for drivers that don't.
+*/
+function mysqlGeoValueToPoint(value) {
+	if (typeof value === "object" && value !== null && typeof value.x === "number" && typeof value.y === "number") return [value.x, value.y];
+	if (value instanceof Uint8Array && value.length >= 25) {
+		const buf = Buffer.isBuffer(value) ? value : Buffer.from(value);
+		const littleEndian = buf.readUInt8(4) === 1;
+		if (((littleEndian ? buf.readUInt32LE(5) : buf.readUInt32BE(5)) & 255) === 1) return [littleEndian ? buf.readDoubleLE(9) : buf.readDoubleBE(9), littleEndian ? buf.readDoubleLE(17) : buf.readDoubleBE(17)];
+	}
+}
+/**
 * Builds an INSERT statement.
 */
 function buildInsert$1(table, data) {
@@ -120,6 +164,7 @@ function mysqlTypeFromField(field) {
 	const metadata = field.type?.metadata;
 	const mysqlTypeOverride = metadata?.get("db.mysql.type");
 	if (mysqlTypeOverride) return mysqlTypeOverride;
+	if (field.isGeoPoint && !field.encrypted) return "POINT SRID 4326";
 	const unsigned = metadata?.has("db.mysql.unsigned") ?? false;
 	const precision = metadata?.get("db.column.precision");
 	switch (field.designType) {
@@ -408,6 +453,13 @@ var MysqlAdapter = class MysqlAdapter extends BaseDbAdapter {
 			toStorage: (value) => typeof value === "number" ? epochMsToUtcDatetime(value) : value,
 			fromStorage: utcDatetimeToEpochMs
 		};
+		if (field.isGeoPoint && !field.encrypted) return {
+			toStorage: (value) => {
+				const point = normalizeGeoPointValue(value);
+				return point ? geoPointToMysqlInternal(point) : value;
+			},
+			fromStorage: (value) => mysqlGeoValueToPoint(value) ?? value
+		};
 	}
 	/**
 	* Wraps an async write operation to catch MySQL constraint errors
@@ -577,8 +629,11 @@ var MysqlAdapter = class MysqlAdapter extends BaseDbAdapter {
 		this._log(sql, params);
 		return { deletedCount: (await this._wrapConstraintError(() => this._exec().run(sql, params))).affectedRows };
 	}
-	async ensureTable() {
+	async prepareTypeMapper() {
 		if (this._supportsVector === void 0 && this._vectorFields.size > 0) await this._detectVectorSupport();
+	}
+	async ensureTable() {
+		await this.prepareTypeMapper();
 		if (this._table instanceof AtscriptDbView) return this._ensureView();
 		const sql = buildCreateTable(this.resolveTableName(), this._table.fieldDescriptors, this._table.foreignKeys, {
 			engine: this._engine,
@@ -602,12 +657,12 @@ var MysqlAdapter = class MysqlAdapter extends BaseDbAdapter {
 	}
 	async getExistingColumnsForTable(tableName) {
 		const schema = this._schema;
-		return (await this._exec().all(`SELECT COLUMN_NAME, COLUMN_TYPE, IS_NULLABLE, COLUMN_KEY, COLUMN_DEFAULT
+		return (await this._exec().all(`SELECT COLUMN_NAME, COLUMN_TYPE, IS_NULLABLE, COLUMN_KEY, COLUMN_DEFAULT, SRS_ID
        FROM INFORMATION_SCHEMA.COLUMNS
        WHERE TABLE_NAME = ? AND TABLE_SCHEMA = COALESCE(?, DATABASE())
        ORDER BY ORDINAL_POSITION`, [tableName, schema])).map((r) => ({
 			name: r.COLUMN_NAME,
-			type: r.COLUMN_TYPE.toUpperCase(),
+			type: r.SRS_ID == null ? r.COLUMN_TYPE.toUpperCase() : `${r.COLUMN_TYPE.toUpperCase()} SRID ${r.SRS_ID}`,
 			notnull: r.IS_NULLABLE === "NO",
 			pk: r.COLUMN_KEY === "PRI",
 			dflt_value: normalizeMysqlDefault(r.COLUMN_DEFAULT)
@@ -628,7 +683,7 @@ var MysqlAdapter = class MysqlAdapter extends BaseDbAdapter {
 			let ddl = `ALTER TABLE ${quoteTableName(tableName)} ADD COLUMN ${qi(field.physicalName)} ${sqlType}`;
 			if (!field.optional && !field.isPrimaryKey) ddl += " NOT NULL";
 			if (field.defaultValue?.kind === "value") ddl += ` DEFAULT ${defaultValueToSqlLiteral(field.designType, field.defaultValue.value)}`;
-			else if (!field.optional && !field.isPrimaryKey) ddl += ` DEFAULT ${defaultValueForType(field.designType)}`;
+			else if (!field.optional && !field.isPrimaryKey) ddl += field.isGeoPoint && !field.encrypted ? ` DEFAULT (ST_SRID(POINT(0, 0), 4326))` : ` DEFAULT ${defaultValueForType(field.designType)}`;
 			if (field.collate) {
 				const nativeCollate = field.type?.metadata?.get("db.mysql.collate");
 				ddl += ` COLLATE ${nativeCollate ?? collationToMysql(field.collate)}`;
@@ -639,6 +694,10 @@ var MysqlAdapter = class MysqlAdapter extends BaseDbAdapter {
 		}
 		for (const { field } of diff.typeChanged ?? []) {
 			const sqlType = this.typeMapper(field);
+			if (field.isGeoPoint && !field.encrypted && sqlType.startsWith("POINT")) {
+				await this._migrateJsonColumnToPoint(tableName, field);
+				continue;
+			}
 			let ddl = `ALTER TABLE ${quoteTableName(tableName)} MODIFY COLUMN ${qi(field.physicalName)} ${sqlType}`;
 			if (!field.optional && !field.isPrimaryKey) ddl += " NOT NULL";
 			this._log(ddl);
@@ -725,6 +784,21 @@ var MysqlAdapter = class MysqlAdapter extends BaseDbAdapter {
 		this._log(ddl);
 		await this._exec().exec(ddl);
 	}
+	async dropIndexesForColumns(columns) {
+		const placeholders = columns.map(() => "?").join(", ");
+		const rows = await this._exec().all(`SELECT DISTINCT INDEX_NAME AS name FROM INFORMATION_SCHEMA.STATISTICS
+       WHERE TABLE_NAME = ? AND TABLE_SCHEMA = COALESCE(?, DATABASE())
+         AND INDEX_NAME LIKE 'atscript\\_\\_%' AND COLUMN_NAME IN (${placeholders})`, [
+			this._table.tableName,
+			this._schema,
+			...columns
+		]);
+		for (const row of rows) {
+			const sql = `DROP INDEX ${qi(row.name)} ON ${quoteTableName(this.resolveTableName())}`;
+			this._log(sql);
+			await this._exec().exec(sql);
+		}
+	}
 	async dropTableByName(tableName) {
 		const ddl = `DROP TABLE IF EXISTS ${quoteTableName(tableName)}`;
 		this._log(ddl);
@@ -761,9 +835,28 @@ var MysqlAdapter = class MysqlAdapter extends BaseDbAdapter {
 		const schema = this._schema;
 		const stringFields = new Set(this._table.fieldDescriptors.filter((f) => f.designType === "string").map((f) => f.physicalName));
 		await this.syncIndexesWithDiff({
-			listExisting: async () => this._exec().all(`SELECT DISTINCT INDEX_NAME as name FROM INFORMATION_SCHEMA.STATISTICS
-           WHERE TABLE_NAME = ? AND TABLE_SCHEMA = COALESCE(?, DATABASE())`, [tableName, schema]),
+			listExisting: async () => {
+				return (await this._exec().all(`SELECT INDEX_NAME AS name,
+                  GROUP_CONCAT(COLUMN_NAME ORDER BY SEQ_IN_INDEX SEPARATOR ',') AS columns
+           FROM INFORMATION_SCHEMA.STATISTICS
+           WHERE TABLE_NAME = ? AND TABLE_SCHEMA = COALESCE(?, DATABASE())
+           GROUP BY INDEX_NAME`, [tableName, schema])).map((r) => ({
+					name: r.name,
+					columns: r.columns ? r.columns.split(",") : void 0
+				}));
+			},
 			createIndex: async (index) => {
+				if (index.type === "geo") {
+					const fieldMeta = this._table.fieldDescriptors.find((f) => f.physicalName === index.fields[0]?.name);
+					if (fieldMeta?.optional) {
+						this.logger.warn(`[mysql] geo index "${index.name}" skipped — SPATIAL indexes require a NOT NULL column; make "${fieldMeta.path}" required to index it`);
+						return;
+					}
+					const sql = `CREATE SPATIAL INDEX ${qi(index.key)} ON ${quoteTableName(this.resolveTableName())} (${qi(index.fields[0].name)})`;
+					this._log(sql);
+					await this._exec().exec(sql);
+					return;
+				}
 				const unique = index.type === "unique" ? "UNIQUE " : "";
 				const fulltext = index.type === "fulltext" ? "FULLTEXT " : "";
 				const isFulltext = index.type === "fulltext";
@@ -778,10 +871,6 @@ var MysqlAdapter = class MysqlAdapter extends BaseDbAdapter {
 				const sql = `DROP INDEX ${qi(name)} ON ${quoteTableName(this.resolveTableName())}`;
 				this._log(sql);
 				await this._exec().exec(sql);
-			},
-			warnUnsupportedTypes: {
-				adapter: "mysql",
-				types: ["geo"]
 			}
 		});
 	}
@@ -1008,6 +1097,65 @@ var MysqlAdapter = class MysqlAdapter extends BaseDbAdapter {
 		if (queryThreshold !== void 0) return queryThreshold;
 		return this._vectorThresholds.get(indexName);
 	}
+	/** Native POINT SRID 4326 + ST_Distance_Sphere — available on MySQL 8.0+. */
+	isGeoSearchable() {
+		return true;
+	}
+	async geoSearch(point, query, indexName) {
+		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) {
+		const ctx = this._prepareGeoSearch(point, query, indexName);
+		const { sql, params } = this._buildGeoSearchSelect(ctx);
+		const countFrag = buildGeoSearchCount(mysqlDialect, 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: Number(countRow?.cnt ?? 0)
+		};
+	}
+	/** Resolves the shared parts of a geo search once (column, filter, distance, window). */
+	_prepareGeoSearch(point, query, indexName) {
+		const column = this._resolveGeoColumn(indexName);
+		const controls = query.controls ?? {};
+		return {
+			tableName: this.resolveTableName(),
+			where: buildWhere(query.filter),
+			dist: mysqlGeoDistanceExpr(qi(column), point),
+			window: geoWindowFromControls(controls),
+			controls
+		};
+	}
+	_buildGeoSearchSelect(ctx) {
+		return buildGeoSearchSelect(mysqlDialect, ctx.tableName, ctx.where, ctx.dist, ctx.window, {
+			$limit: ctx.controls.$limit,
+			$skip: ctx.controls.$skip
+		});
+	}
+	/**
+	* Migrates a v1 JSON `[lng, lat]` column to native `POINT SRID 4326` via a
+	* temp column (MySQL has no JSON→geometry cast for MODIFY COLUMN).
+	*/
+	async _migrateJsonColumnToPoint(tableName, field) {
+		const col = qi(field.physicalName);
+		const tmp = qi(`${field.physicalName}__geo_mig`);
+		const quotedTable = quoteTableName(tableName);
+		const steps = [
+			`ALTER TABLE ${quotedTable} ADD COLUMN ${tmp} POINT SRID 4326 NULL`,
+			`UPDATE ${quotedTable} SET ${tmp} = ST_SRID(POINT(CAST(${col}->>'$[0]' AS DOUBLE), CAST(${col}->>'$[1]' AS DOUBLE)), 4326) WHERE ${col} IS NOT NULL`,
+			`ALTER TABLE ${quotedTable} DROP COLUMN ${col}`,
+			`ALTER TABLE ${quotedTable} RENAME COLUMN ${tmp} TO ${col}`,
+			...field.optional || field.isPrimaryKey ? [] : [`ALTER TABLE ${quotedTable} MODIFY COLUMN ${col} POINT SRID 4326 NOT NULL`]
+		];
+		for (const ddl of steps) {
+			this._log(ddl);
+			await this._exec().exec(ddl);
+		}
+	}
 };
 /**
 * Normalizes MySQL INFORMATION_SCHEMA.COLUMNS.COLUMN_DEFAULT values

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atscript/db-mysql",
-  "version": "0.1.105",
+  "version": "0.1.106",
   "description": "MySQL adapter for @atscript/db with mysql2 driver support.",
   "keywords": [
     "atscript",
@@ -52,8 +52,8 @@
     "@atscript/typescript": "^0.1.76",
     "@uniqu/core": "^0.1.6",
     "mysql2": ">=3.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": {
     "mysql2": {