@atscript/db-mysql 0.1.149 → 0.1.150

package/dist/index.cjs

@@ -165,6 +165,7 @@ const mysqlDialect = {
 			params: [pattern]
 		};
 	},
+	integerText: (expr) => `CAST(CAST(${expr} AS SIGNED) AS CHAR)`,
 	mapQueryError(error, arithmetic) {
 		if (error?.errno !== 1690) return void 0;
 		return arithmetic ? (0, _atscript_db_sql_tools.arithOverflowError)() : (0, _atscript_db_sql_tools.numericOutOfRangeError)();
@@ -1198,9 +1199,9 @@ var MysqlAdapter = class MysqlAdapter extends _atscript_db.BaseDbAdapter {
 		});
 		return hit;
 	}
-	async updateOne(filter, data, ops, expectedVersion) {
+	async updateOne(filter, data, ops, expectedVersion, opts) {
 		const where = this._mutationWhere(filter);
-		const versionColumn = this._table.versionColumnPhysical;
+		const versionColumn = this._versionColumnFor(opts, expectedVersion);
 		const { sql, params } = buildUpdate(this.resolveTableName(), data, where, 1, ops, versionColumn, expectedVersion);
 		this._log(sql, params);
 		const result = await this._wrapConstraintError(() => this._exec().run(sql, params));
@@ -1209,9 +1210,9 @@ var MysqlAdapter = class MysqlAdapter extends _atscript_db.BaseDbAdapter {
 			modifiedCount: result.changedRows
 		};
 	}
-	async updateMany(filter, data, ops) {
+	async updateMany(filter, data, ops, opts) {
 		const where = this._mutationWhere(filter);
-		const versionColumn = this._table.versionColumnPhysical;
+		const versionColumn = this._versionColumnFor(opts);
 		const { sql, params } = buildUpdate(this.resolveTableName(), data, where, void 0, ops, versionColumn);
 		this._log(sql, params);
 		const result = await this._wrapConstraintError(() => this._exec().run(sql, params));
@@ -1603,7 +1604,9 @@ var MysqlAdapter = class MysqlAdapter extends _atscript_db.BaseDbAdapter {
 				const unique = index.type === "unique" ? "UNIQUE " : "";
 				const fulltext = index.type === "fulltext" ? "FULLTEXT " : "";
 				const isFulltext = index.type === "fulltext";
-				const cols = index.fields.map((f) => {
+				const members = isFulltext ? (0, _atscript_db.splitFulltextFields)(index).text : index.fields;
+				if (members.length === 0) return;
+				const cols = members.map((f) => {
 					const col = qi(f.name);
 					const prefix = isFulltext ? void 0 : desiredPrefix(f.name);
 					const order = isFulltext ? "" : ` ${f.sort === "desc" ? "DESC" : "ASC"}`;
@@ -1674,12 +1677,14 @@ var MysqlAdapter = class MysqlAdapter extends _atscript_db.BaseDbAdapter {
 	}
 	getSearchIndexes() {
 		const indexes = [];
-		for (const index of this._table.indexes.values()) if (index.type === "fulltext") indexes.push({
+		const ftAll = [...this._table.indexes.values()].filter((i) => i.type === "fulltext");
+		const ftDefault = (0, _atscript_db.defaultFulltextIndex)(ftAll);
+		for (const index of ftAll) indexes.push({
 			name: index.key,
-			description: `FULLTEXT index on ${index.fields.map((f) => f.name).join(", ")}`,
+			description: (0, _atscript_db.describeFulltext)(index, (names) => `FULLTEXT index on ${names}`),
 			type: "text",
 			fields: this._indexLogicalPaths(index),
-			isDefault: indexes.length === 0
+			isDefault: index === ftDefault
 		});
 		let firstVector = true;
 		for (const [field, vec] of this._vectorFields) {
@@ -1722,18 +1727,38 @@ var MysqlAdapter = class MysqlAdapter extends _atscript_db.BaseDbAdapter {
 	_buildSearchWhere(text, query, indexName) {
 		const fulltextIndex = this._getFulltextIndex(indexName);
 		if (!fulltextIndex) throw new Error("No FULLTEXT index found for search");
-		const matchCols = fulltextIndex.fields.map((f) => qi(f.name)).join(", ");
+		const { text: textFields, integer: integerFields } = (0, _atscript_db.splitFulltextFields)(fulltextIndex);
 		const where = buildWhere(query.filter);
-		const matchClause = `MATCH(${matchCols}) AGAINST(? IN NATURAL LANGUAGE MODE)`;
-		return {
-			sql: where.sql === "1=1" ? matchClause : `${where.sql} AND ${matchClause}`,
-			params: [...where.params, text]
-		};
+		const n = integerFields.length > 0 ? (0, _atscript_db.searchTermInteger)(text) : void 0;
+		const matchClause = `MATCH(${textFields.map((f) => qi(f.name)).join(", ")}) AGAINST(? IN NATURAL LANGUAGE MODE)`;
+		const withWhere = (clause, params) => ({
+			sql: where.sql === "1=1" ? clause : `${where.sql} AND ${clause}`,
+			params: [...where.params, ...params]
+		});
+		if (n === void 0) return textFields.length === 0 ? withWhere(_atscript_db_sql_tools.EMPTY_OR.sql, []) : withWhere(matchClause, [text]);
+		const keys = this._table.primaryKeys.map((key) => qi(this._table.physicalPath(key)));
+		if (keys.length === 0) {
+			const or = (0, _atscript_db_sql_tools.orFragment)([...textFields.length > 0 ? [matchClause] : [], ...integerFields.map((f) => `${qi(f.name)} = ?`)], [...textFields.length > 0 ? [text] : [], ...integerFields.map(() => n)]);
+			return withWhere(or.sql, or.params);
+		}
+		const table = quoteTableName(this.resolveTableName());
+		const keyList = keys.join(", ");
+		const arms = [];
+		const params = [];
+		if (textFields.length > 0) {
+			arms.push(`SELECT ${keyList} FROM ${table} WHERE ${matchClause}`);
+			params.push(text);
+		}
+		for (const f of integerFields) {
+			arms.push(`SELECT ${keyList} FROM ${table} WHERE ${qi(f.name)} = ?`);
+			params.push(n);
+		}
+		return withWhere(`${keys.length === 1 ? keyList : `(${keyList})`} IN (SELECT ${keyList} FROM (${arms.join(" UNION ")}) AS ${qi("_atscript_search")})`, params);
 	}
 	_getFulltextIndex(indexName) {
-		for (const index of this._table.indexes.values()) if (index.type === "fulltext") {
-			if (!indexName || index.key === indexName) return index;
-		}
+		const ftAll = [...this._table.indexes.values()].filter((i) => i.type === "fulltext");
+		if (!indexName) return (0, _atscript_db.defaultFulltextIndex)(ftAll);
+		return ftAll.find((index) => index.key === indexName);
 	}
 	/**
 	* Detects native VECTOR type support by inspecting the server version.

package/dist/index.d.cts

@@ -1,4 +1,4 @@
-import { AggregateFn, BaseDbAdapter, BucketUnit, DbQuery, DbSpace, FilterExpr, TColumnDiff, TDbDefaultFn, TDbDeleteResult, TDbFieldMeta, TDbInsertIgnoreSlot, TDbInsertManyResult, TDbInsertResult, TDbObjectKind, TDbUpdateResult, TEnsureTableOptions, TExistingColumn, TExistingTableOption, TFieldOps, TPrimaryKeyChange, TReferencingForeignKey, TSearchIndexInfo, TSyncColumnResult, TTableOptionDiff, TValueFormatterPair, TViewCapability } from "@atscript/db";
+import { AggregateFn, BaseDbAdapter, BucketUnit, DbQuery, DbSpace, FilterExpr, TColumnDiff, TDbDefaultFn, TDbDeleteResult, TDbFieldMeta, TDbInsertIgnoreSlot, TDbInsertManyResult, TDbInsertResult, TDbObjectKind, TDbUpdateOptions, TDbUpdateResult, TEnsureTableOptions, TExistingColumn, TExistingTableOption, TFieldOps, TPrimaryKeyChange, TReferencingForeignKey, TSearchIndexInfo, TSyncColumnResult, TTableOptionDiff, TValueFormatterPair, TViewCapability } from "@atscript/db";
 import { TMetadataMap } from "@atscript/typescript/utils";
 import { FilterExpr as FilterExpr$1 } from "@uniqu/core";
 import { TFilterVisitorOptions, TSqlFragment, TSqlFragment as TSqlFragment$1 } from "@atscript/db-sql-tools";
@@ -293,8 +293,8 @@ declare class MysqlAdapter extends BaseDbAdapter {
   private _mutationWhere;
   /** `true` when a relational predicate of `filter` (nested ones included) reads this table. */
   private _filterReadsOwnTable;
-  updateOne(filter: FilterExpr, data: Record<string, unknown>, ops?: TFieldOps, expectedVersion?: number): Promise<TDbUpdateResult>;
-  updateMany(filter: FilterExpr, data: Record<string, unknown>, ops?: TFieldOps): Promise<TDbUpdateResult>;
+  updateOne(filter: FilterExpr, data: Record<string, unknown>, ops?: TFieldOps, expectedVersion?: number, opts?: TDbUpdateOptions): Promise<TDbUpdateResult>;
+  updateMany(filter: FilterExpr, data: Record<string, unknown>, ops?: TFieldOps, opts?: TDbUpdateOptions): Promise<TDbUpdateResult>;
   replaceOne(filter: FilterExpr, data: Record<string, unknown>, expectedVersion?: number): Promise<TDbUpdateResult>;
   replaceMany(filter: FilterExpr, data: Record<string, unknown>): Promise<TDbUpdateResult>;
   deleteOne(filter: FilterExpr): Promise<TDbDeleteResult>;

package/dist/index.d.mts

@@ -1,4 +1,4 @@
-import { AggregateFn, BaseDbAdapter, BucketUnit, DbQuery, DbSpace, FilterExpr, TColumnDiff, TDbDefaultFn, TDbDeleteResult, TDbFieldMeta, TDbInsertIgnoreSlot, TDbInsertManyResult, TDbInsertResult, TDbObjectKind, TDbUpdateResult, TEnsureTableOptions, TExistingColumn, TExistingTableOption, TFieldOps, TPrimaryKeyChange, TReferencingForeignKey, TSearchIndexInfo, TSyncColumnResult, TTableOptionDiff, TValueFormatterPair, TViewCapability } from "@atscript/db";
+import { AggregateFn, BaseDbAdapter, BucketUnit, DbQuery, DbSpace, FilterExpr, TColumnDiff, TDbDefaultFn, TDbDeleteResult, TDbFieldMeta, TDbInsertIgnoreSlot, TDbInsertManyResult, TDbInsertResult, TDbObjectKind, TDbUpdateOptions, TDbUpdateResult, TEnsureTableOptions, TExistingColumn, TExistingTableOption, TFieldOps, TPrimaryKeyChange, TReferencingForeignKey, TSearchIndexInfo, TSyncColumnResult, TTableOptionDiff, TValueFormatterPair, TViewCapability } from "@atscript/db";
 import { TFilterVisitorOptions, TSqlFragment, TSqlFragment as TSqlFragment$1 } from "@atscript/db-sql-tools";
 import { FilterExpr as FilterExpr$1 } from "@uniqu/core";
 import { TMetadataMap } from "@atscript/typescript/utils";
@@ -293,8 +293,8 @@ declare class MysqlAdapter extends BaseDbAdapter {
   private _mutationWhere;
   /** `true` when a relational predicate of `filter` (nested ones included) reads this table. */
   private _filterReadsOwnTable;
-  updateOne(filter: FilterExpr, data: Record<string, unknown>, ops?: TFieldOps, expectedVersion?: number): Promise<TDbUpdateResult>;
-  updateMany(filter: FilterExpr, data: Record<string, unknown>, ops?: TFieldOps): Promise<TDbUpdateResult>;
+  updateOne(filter: FilterExpr, data: Record<string, unknown>, ops?: TFieldOps, expectedVersion?: number, opts?: TDbUpdateOptions): Promise<TDbUpdateResult>;
+  updateMany(filter: FilterExpr, data: Record<string, unknown>, ops?: TFieldOps, opts?: TDbUpdateOptions): Promise<TDbUpdateResult>;
   replaceOne(filter: FilterExpr, data: Record<string, unknown>, expectedVersion?: number): Promise<TDbUpdateResult>;
   replaceMany(filter: FilterExpr, data: Record<string, unknown>): Promise<TDbUpdateResult>;
   deleteOne(filter: FilterExpr): Promise<TDbDeleteResult>;

package/dist/index.mjs

@@ -1,6 +1,6 @@
-import { ALL_AGGREGATE_FNS, ALL_BUCKET_UNITS, ALL_VIEW_CAPABILITIES, BaseDbAdapter, DbError, DbSpace, NoopLogger, bucketTimeZoneUnavailable, containsRelationFilter, fkColumns, forEachResolvedRelation, isConflict, uniqueKeyTuple, vectorIndexNotFoundMessage } from "@atscript/db";
+import { ALL_AGGREGATE_FNS, ALL_BUCKET_UNITS, ALL_VIEW_CAPABILITIES, BaseDbAdapter, DbError, DbSpace, NoopLogger, bucketTimeZoneUnavailable, containsRelationFilter, defaultFulltextIndex, describeFulltext, fkColumns, forEachResolvedRelation, isConflict, 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, foreignKeySql, geoWindowFromControls, jsonDollarPath, mapQueryErrors, normalizeGeoPointValue, numericOutOfRangeError, parseRegexString, renameGeoDistance, replaceColumnsFor, sqlTimeZoneLiteral, stripPartitionRowNumber, toSqlValue, vectorDistanceSource } from "@atscript/db-sql-tools";
+import { EMPTY_OR, 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, foreignKeySql, geoWindowFromControls, jsonDollarPath, mapQueryErrors, normalizeGeoPointValue, numericOutOfRangeError, orFragment, parseRegexString, renameGeoDistance, replaceColumnsFor, sqlTimeZoneLiteral, stripPartitionRowNumber, toSqlValue, vectorDistanceSource } from "@atscript/db-sql-tools";
 import { BUCKET_MAX_INSTANT, BUCKET_MIN_INSTANT } from "@uniqu/core";
 //#region src/sql-builder.ts
 /** TEXT / BLOB families (`TINYTEXT` … `LONGBLOB`). */
@@ -164,6 +164,7 @@ const mysqlDialect = {
 			params: [pattern]
 		};
 	},
+	integerText: (expr) => `CAST(CAST(${expr} AS SIGNED) AS CHAR)`,
 	mapQueryError(error, arithmetic) {
 		if (error?.errno !== 1690) return void 0;
 		return arithmetic ? arithOverflowError() : numericOutOfRangeError();
@@ -1197,9 +1198,9 @@ var MysqlAdapter = class MysqlAdapter extends BaseDbAdapter {
 		});
 		return hit;
 	}
-	async updateOne(filter, data, ops, expectedVersion) {
+	async updateOne(filter, data, ops, expectedVersion, opts) {
 		const where = this._mutationWhere(filter);
-		const versionColumn = this._table.versionColumnPhysical;
+		const versionColumn = this._versionColumnFor(opts, expectedVersion);
 		const { sql, params } = buildUpdate$1(this.resolveTableName(), data, where, 1, ops, versionColumn, expectedVersion);
 		this._log(sql, params);
 		const result = await this._wrapConstraintError(() => this._exec().run(sql, params));
@@ -1208,9 +1209,9 @@ var MysqlAdapter = class MysqlAdapter extends BaseDbAdapter {
 			modifiedCount: result.changedRows
 		};
 	}
-	async updateMany(filter, data, ops) {
+	async updateMany(filter, data, ops, opts) {
 		const where = this._mutationWhere(filter);
-		const versionColumn = this._table.versionColumnPhysical;
+		const versionColumn = this._versionColumnFor(opts);
 		const { sql, params } = buildUpdate$1(this.resolveTableName(), data, where, void 0, ops, versionColumn);
 		this._log(sql, params);
 		const result = await this._wrapConstraintError(() => this._exec().run(sql, params));
@@ -1602,7 +1603,9 @@ var MysqlAdapter = class MysqlAdapter extends BaseDbAdapter {
 				const unique = index.type === "unique" ? "UNIQUE " : "";
 				const fulltext = index.type === "fulltext" ? "FULLTEXT " : "";
 				const isFulltext = index.type === "fulltext";
-				const cols = index.fields.map((f) => {
+				const members = isFulltext ? splitFulltextFields(index).text : index.fields;
+				if (members.length === 0) return;
+				const cols = members.map((f) => {
 					const col = qi(f.name);
 					const prefix = isFulltext ? void 0 : desiredPrefix(f.name);
 					const order = isFulltext ? "" : ` ${f.sort === "desc" ? "DESC" : "ASC"}`;
@@ -1673,12 +1676,14 @@ var MysqlAdapter = class MysqlAdapter extends BaseDbAdapter {
 	}
 	getSearchIndexes() {
 		const indexes = [];
-		for (const index of this._table.indexes.values()) if (index.type === "fulltext") indexes.push({
+		const ftAll = [...this._table.indexes.values()].filter((i) => i.type === "fulltext");
+		const ftDefault = defaultFulltextIndex(ftAll);
+		for (const index of ftAll) indexes.push({
 			name: index.key,
-			description: `FULLTEXT index on ${index.fields.map((f) => f.name).join(", ")}`,
+			description: describeFulltext(index, (names) => `FULLTEXT index on ${names}`),
 			type: "text",
 			fields: this._indexLogicalPaths(index),
-			isDefault: indexes.length === 0
+			isDefault: index === ftDefault
 		});
 		let firstVector = true;
 		for (const [field, vec] of this._vectorFields) {
@@ -1721,18 +1726,38 @@ var MysqlAdapter = class MysqlAdapter extends BaseDbAdapter {
 	_buildSearchWhere(text, query, indexName) {
 		const fulltextIndex = this._getFulltextIndex(indexName);
 		if (!fulltextIndex) throw new Error("No FULLTEXT index found for search");
-		const matchCols = fulltextIndex.fields.map((f) => qi(f.name)).join(", ");
+		const { text: textFields, integer: integerFields } = splitFulltextFields(fulltextIndex);
 		const where = buildWhere(query.filter);
-		const matchClause = `MATCH(${matchCols}) AGAINST(? IN NATURAL LANGUAGE MODE)`;
-		return {
-			sql: where.sql === "1=1" ? matchClause : `${where.sql} AND ${matchClause}`,
-			params: [...where.params, text]
-		};
+		const n = integerFields.length > 0 ? searchTermInteger(text) : void 0;
+		const matchClause = `MATCH(${textFields.map((f) => qi(f.name)).join(", ")}) AGAINST(? IN NATURAL LANGUAGE MODE)`;
+		const withWhere = (clause, params) => ({
+			sql: where.sql === "1=1" ? clause : `${where.sql} AND ${clause}`,
+			params: [...where.params, ...params]
+		});
+		if (n === void 0) return textFields.length === 0 ? withWhere(EMPTY_OR.sql, []) : withWhere(matchClause, [text]);
+		const keys = this._table.primaryKeys.map((key) => qi(this._table.physicalPath(key)));
+		if (keys.length === 0) {
+			const or = orFragment([...textFields.length > 0 ? [matchClause] : [], ...integerFields.map((f) => `${qi(f.name)} = ?`)], [...textFields.length > 0 ? [text] : [], ...integerFields.map(() => n)]);
+			return withWhere(or.sql, or.params);
+		}
+		const table = quoteTableName(this.resolveTableName());
+		const keyList = keys.join(", ");
+		const arms = [];
+		const params = [];
+		if (textFields.length > 0) {
+			arms.push(`SELECT ${keyList} FROM ${table} WHERE ${matchClause}`);
+			params.push(text);
+		}
+		for (const f of integerFields) {
+			arms.push(`SELECT ${keyList} FROM ${table} WHERE ${qi(f.name)} = ?`);
+			params.push(n);
+		}
+		return withWhere(`${keys.length === 1 ? keyList : `(${keyList})`} IN (SELECT ${keyList} FROM (${arms.join(" UNION ")}) AS ${qi("_atscript_search")})`, params);
 	}
 	_getFulltextIndex(indexName) {
-		for (const index of this._table.indexes.values()) if (index.type === "fulltext") {
-			if (!indexName || index.key === indexName) return index;
-		}
+		const ftAll = [...this._table.indexes.values()].filter((i) => i.type === "fulltext");
+		if (!indexName) return defaultFulltextIndex(ftAll);
+		return ftAll.find((index) => index.key === indexName);
 	}
 	/**
 	* Detects native VECTOR type support by inspecting the server version.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atscript/db-mysql",
-  "version": "0.1.149",
+  "version": "0.1.150",
   "description": "MySQL adapter for @atscript/db with mysql2 driver support.",
   "keywords": [
     "atscript",
@@ -41,19 +41,19 @@
     "access": "public"
   },
   "devDependencies": {
-    "@atscript/core": "^0.1.100",
-    "@atscript/typescript": "^0.1.100",
+    "@atscript/core": "^0.1.101",
+    "@atscript/typescript": "^0.1.101",
     "@uniqu/core": "^0.1.13",
     "mysql2": "^3.11.0",
-    "unplugin-atscript": "^0.1.100"
+    "unplugin-atscript": "^0.1.101"
   },
   "peerDependencies": {
-    "@atscript/core": "^0.1.100",
-    "@atscript/typescript": "^0.1.100",
+    "@atscript/core": "^0.1.101",
+    "@atscript/typescript": "^0.1.101",
     "@uniqu/core": "^0.1.13",
     "mysql2": ">=3.0.0",
-    "@atscript/db": "^0.1.149",
-    "@atscript/db-sql-tools": "^0.1.149"
+    "@atscript/db": "^0.1.150",
+    "@atscript/db-sql-tools": "^0.1.150"
   },
   "peerDependenciesMeta": {
     "mysql2": {