@atscript/db-mysql 0.1.166 → 0.1.168

package/dist/index.cjs

@@ -212,6 +212,8 @@ const mysqlDialect = {
 	},
 	jsonFromText: (quotedCol) => `IF(JSON_VALID(${quotedCol}), ${quotedCol}, JSON_QUOTE(${quotedCol}))`,
 	castDouble: (expr) => `CAST(${expr} AS DOUBLE)`,
+	conditionalAggregate: "case",
+	countDistinctColumns: (columns, when) => `COUNT(DISTINCT ${columns.map((c) => when ? `CASE WHEN ${when} THEN ${c} END` : c).join(", ")})`,
 	createViewPrefix: "CREATE OR REPLACE VIEW"
 };
 /** `JSON_TYPE()` names of JSON numbers (MariaDB reports only INTEGER / DOUBLE). */
@@ -811,6 +813,18 @@ var MysqlAdapter = class MysqlAdapter extends _atscript_db.BaseDbAdapter {
 	supportsAggregateExpressions() {
 		return true;
 	}
+	/** Conditional aggregates (`$where` on an aggregate `$select` entry). */
+	supportsConditionalAggregates() {
+		return true;
+	}
+	/** `countDistinct` over several fields. */
+	supportsDistinctFieldLists() {
+		return true;
+	}
+	/** Two-level aggregates (`$from`): the inner level is a derived table. */
+	supportsNestedAggregates() {
+		return true;
+	}
 	/** `$nulls` / `@db.sort.nulls` NULL placement — a leading `(col IS NULL)` key where the native order differs. */
 	supportsNullsPlacement() {
 		return true;
@@ -1421,7 +1435,7 @@ var MysqlAdapter = class MysqlAdapter extends _atscript_db.BaseDbAdapter {
 		const search = (0, _atscript_db_agg.resolveAggregateSearch)(query.controls);
 		const where = search ? this._buildSearchWhere(search.text, query, search.indexName) : buildWhere(query.filter);
 		const tableName = search ? this.resolveTableName() : this._readSource(query, "aggregate");
-		for (const bucket of query.controls.$select?.buckets ?? []) await this._ensureBucketZone(bucket.tz);
+		for (const select of [query.controls.$select, query.controls.$from?.$select]) for (const bucket of select?.buckets ?? []) await this._ensureBucketZone(bucket.tz);
 		if (query.controls.$count) {
 			const { sql, params } = buildAggregateCount(tableName, where, query.controls);
 			this._log(sql, params);
@@ -1925,6 +1939,7 @@ var MysqlAdapter = class MysqlAdapter extends _atscript_db.BaseDbAdapter {
 	}
 	async renameTable(oldName) {
 		const newName = this.resolveTableName();
+		if (!await this.getObjectKind(oldName) && await this.getObjectKind(this._table.tableName)) return;
 		const ddl = `RENAME TABLE ${quoteTableName(oldName)} TO ${quoteTableName(newName)}`;
 		this._log(ddl);
 		await this._exec().exec(ddl);
@@ -1940,6 +1955,9 @@ var MysqlAdapter = class MysqlAdapter extends _atscript_db.BaseDbAdapter {
 	async _syncIndexes(dryRun) {
 		const tableName = this._table.tableName;
 		const schema = this._schema;
+		if (!dryRun) {
+			for (const index of this._table.indexes.values()) if (index.type === "fulltext" && index.language !== void 0) this.logger.warn(`[mysql] fulltext index "${index.name}": @db.index.fulltext.language "${index.language}" is ignored — MySQL FULLTEXT has no per-index language`);
+		}
 		const bytesPerChar = mysqlBytesPerChar(this._charset);
 		const fields = new Map(this._table.fieldDescriptors.map((f) => [f.physicalName, f]));
 		const mappedType = (column) => {
@@ -2123,13 +2141,16 @@ var MysqlAdapter = class MysqlAdapter extends _atscript_db.BaseDbAdapter {
 		const { text: textFields, integer: integerFields } = (0, _atscript_db.splitFulltextFields)(fulltextIndex);
 		const where = buildWhere(query.filter);
 		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 matchCols = textFields.map((f) => qi(f.name)).join(", ");
+		const all = fulltextIndex.match === "all";
+		const matchClause = `MATCH(${matchCols}) AGAINST(? IN ${all ? "BOOLEAN" : "NATURAL LANGUAGE"} MODE)`;
+		const term = all ? mysqlRequireEveryTerm(text) : text;
 		const rank = (0, _atscript_db_sql_tools.searchRankOrder)(mysqlDialect, {
 			exactEqualities: n === void 0 ? [] : integerFields.map((f) => `${qi(f.name)} = ?`),
 			n,
 			textRank: textFields.length > 0 ? {
 				sql: `${matchClause} DESC`,
-				params: [text]
+				params: [term]
 			} : void 0,
 			pkColumns: this._table.primaryKeys.map((key) => this._table.physicalPath(key))
 		});
@@ -2138,10 +2159,10 @@ var MysqlAdapter = class MysqlAdapter extends _atscript_db.BaseDbAdapter {
 			params: [...where.params, ...params],
 			rank
 		});
-		if (n === void 0) return textFields.length === 0 ? withWhere(_atscript_db_sql_tools.EMPTY_OR.sql, []) : withWhere(matchClause, [text]);
+		if (n === void 0) return textFields.length === 0 ? withWhere(_atscript_db_sql_tools.EMPTY_OR.sql, []) : withWhere(matchClause, [term]);
 		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)]);
+			const or = (0, _atscript_db_sql_tools.orFragment)([...textFields.length > 0 ? [matchClause] : [], ...integerFields.map((f) => `${qi(f.name)} = ?`)], [...textFields.length > 0 ? [term] : [], ...integerFields.map(() => n)]);
 			return withWhere(or.sql, or.params);
 		}
 		const table = quoteTableName(this.resolveTableName());
@@ -2150,7 +2171,7 @@ var MysqlAdapter = class MysqlAdapter extends _atscript_db.BaseDbAdapter {
 		const params = [];
 		if (textFields.length > 0) {
 			arms.push(`SELECT ${keyList} FROM ${table} WHERE ${matchClause}`);
-			params.push(text);
+			params.push(term);
 		}
 		for (const f of integerFields) {
 			arms.push(`SELECT ${keyList} FROM ${table} WHERE ${qi(f.name)} = ?`);
@@ -2441,6 +2462,37 @@ function similarityToMysqlFn(similarity) {
 function vectorToString(vector) {
 	return `[${vector.join(",")}]`;
 }
+/** InnoDB's default full-text stop words (`INFORMATION_SCHEMA.INNODB_FT_DEFAULT_STOPWORD`). */
+const INNODB_DEFAULT_STOPWORDS = new Set("a about an are as at be by com de en for from how i in is it la of on or that the this to was what when where who will with und www".split(" "));
+/**
+* A search text as a boolean-mode `AGAINST` term with every word required
+* (`@db.index.fulltext.match "all"`, since 0.1.168): `+word` per word, a
+* `"quoted phrase"` stays one required phrase, a trailing `*` keeps its prefix
+* meaning. The user's own boolean operators (`+ - < > ( ) ~ * " @`) are text,
+* not syntax. A word InnoDB does not index by default — shorter than 3
+* characters (`innodb_ft_min_token_size`) or on its default stop-word list —
+* stays optional: requiring it would match no row.
+*/
+function mysqlRequireEveryTerm(text) {
+	const parts = [];
+	for (const match of text.matchAll(/"([^"]*)"|(\S+)/g)) {
+		const phrase = match[1];
+		if (phrase !== void 0) {
+			const clean = phrase.trim();
+			if (clean) parts.push(`+"${clean}"`);
+			continue;
+		}
+		const word = match[2];
+		const core = word.replace(/\*+$/, "");
+		const pieces = core.split(/[+\-<>()~*"@]+/).filter(Boolean);
+		pieces.forEach((piece, i) => {
+			const star = i === pieces.length - 1 && core.length < word.length ? "*" : "";
+			const required = [...piece].length >= 3 && !INNODB_DEFAULT_STOPWORDS.has(piece.toLowerCase());
+			parts.push(`${required ? "+" : ""}${piece}${star}`);
+		});
+	}
+	return parts.join(" ");
+}
 //#endregion
 //#region src/mysql2-driver.ts
 const NO_PARAMS = [];

package/dist/index.d.cts

@@ -201,6 +201,12 @@ declare class MysqlAdapter extends BaseDbAdapter {
   aggregateFns(): ReadonlySet<AggregateFn>;
   /** Arithmetic in an aggregate `$select` (`{ $expr }`, `{ $fn, $expr }`). */
   supportsAggregateExpressions(): boolean;
+  /** Conditional aggregates (`$where` on an aggregate `$select` entry). */
+  supportsConditionalAggregates(): boolean;
+  /** `countDistinct` over several fields. */
+  supportsDistinctFieldLists(): boolean;
+  /** Two-level aggregates (`$from`): the inner level is a derived table. */
+  supportsNestedAggregates(): boolean;
   /** `$nulls` / `@db.sort.nulls` NULL placement — a leading `(col IS NULL)` key where the native order differs. */
   supportsNullsPlacement(): boolean;
   /**

package/dist/index.d.mts

@@ -201,6 +201,12 @@ declare class MysqlAdapter extends BaseDbAdapter {
   aggregateFns(): ReadonlySet<AggregateFn>;
   /** Arithmetic in an aggregate `$select` (`{ $expr }`, `{ $fn, $expr }`). */
   supportsAggregateExpressions(): boolean;
+  /** Conditional aggregates (`$where` on an aggregate `$select` entry). */
+  supportsConditionalAggregates(): boolean;
+  /** `countDistinct` over several fields. */
+  supportsDistinctFieldLists(): boolean;
+  /** Two-level aggregates (`$from`): the inner level is a derived table. */
+  supportsNestedAggregates(): boolean;
   /** `$nulls` / `@db.sort.nulls` NULL placement — a leading `(col IS NULL)` key where the native order differs. */
   supportsNullsPlacement(): boolean;
   /**

package/dist/index.mjs

@@ -211,6 +211,8 @@ const mysqlDialect = {
 	},
 	jsonFromText: (quotedCol) => `IF(JSON_VALID(${quotedCol}), ${quotedCol}, JSON_QUOTE(${quotedCol}))`,
 	castDouble: (expr) => `CAST(${expr} AS DOUBLE)`,
+	conditionalAggregate: "case",
+	countDistinctColumns: (columns, when) => `COUNT(DISTINCT ${columns.map((c) => when ? `CASE WHEN ${when} THEN ${c} END` : c).join(", ")})`,
 	createViewPrefix: "CREATE OR REPLACE VIEW"
 };
 /** `JSON_TYPE()` names of JSON numbers (MariaDB reports only INTEGER / DOUBLE). */
@@ -810,6 +812,18 @@ var MysqlAdapter = class MysqlAdapter extends BaseDbAdapter {
 	supportsAggregateExpressions() {
 		return true;
 	}
+	/** Conditional aggregates (`$where` on an aggregate `$select` entry). */
+	supportsConditionalAggregates() {
+		return true;
+	}
+	/** `countDistinct` over several fields. */
+	supportsDistinctFieldLists() {
+		return true;
+	}
+	/** Two-level aggregates (`$from`): the inner level is a derived table. */
+	supportsNestedAggregates() {
+		return true;
+	}
 	/** `$nulls` / `@db.sort.nulls` NULL placement — a leading `(col IS NULL)` key where the native order differs. */
 	supportsNullsPlacement() {
 		return true;
@@ -1420,7 +1434,7 @@ var MysqlAdapter = class MysqlAdapter extends BaseDbAdapter {
 		const search = resolveAggregateSearch(query.controls);
 		const where = search ? this._buildSearchWhere(search.text, query, search.indexName) : buildWhere(query.filter);
 		const tableName = search ? this.resolveTableName() : this._readSource(query, "aggregate");
-		for (const bucket of query.controls.$select?.buckets ?? []) await this._ensureBucketZone(bucket.tz);
+		for (const select of [query.controls.$select, query.controls.$from?.$select]) for (const bucket of select?.buckets ?? []) await this._ensureBucketZone(bucket.tz);
 		if (query.controls.$count) {
 			const { sql, params } = buildAggregateCount$1(tableName, where, query.controls);
 			this._log(sql, params);
@@ -1924,6 +1938,7 @@ var MysqlAdapter = class MysqlAdapter extends BaseDbAdapter {
 	}
 	async renameTable(oldName) {
 		const newName = this.resolveTableName();
+		if (!await this.getObjectKind(oldName) && await this.getObjectKind(this._table.tableName)) return;
 		const ddl = `RENAME TABLE ${quoteTableName(oldName)} TO ${quoteTableName(newName)}`;
 		this._log(ddl);
 		await this._exec().exec(ddl);
@@ -1939,6 +1954,9 @@ var MysqlAdapter = class MysqlAdapter extends BaseDbAdapter {
 	async _syncIndexes(dryRun) {
 		const tableName = this._table.tableName;
 		const schema = this._schema;
+		if (!dryRun) {
+			for (const index of this._table.indexes.values()) if (index.type === "fulltext" && index.language !== void 0) this.logger.warn(`[mysql] fulltext index "${index.name}": @db.index.fulltext.language "${index.language}" is ignored — MySQL FULLTEXT has no per-index language`);
+		}
 		const bytesPerChar = mysqlBytesPerChar(this._charset);
 		const fields = new Map(this._table.fieldDescriptors.map((f) => [f.physicalName, f]));
 		const mappedType = (column) => {
@@ -2122,13 +2140,16 @@ var MysqlAdapter = class MysqlAdapter extends BaseDbAdapter {
 		const { text: textFields, integer: integerFields } = splitFulltextFields(fulltextIndex);
 		const where = buildWhere(query.filter);
 		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 matchCols = textFields.map((f) => qi(f.name)).join(", ");
+		const all = fulltextIndex.match === "all";
+		const matchClause = `MATCH(${matchCols}) AGAINST(? IN ${all ? "BOOLEAN" : "NATURAL LANGUAGE"} MODE)`;
+		const term = all ? mysqlRequireEveryTerm(text) : text;
 		const rank = searchRankOrder(mysqlDialect, {
 			exactEqualities: n === void 0 ? [] : integerFields.map((f) => `${qi(f.name)} = ?`),
 			n,
 			textRank: textFields.length > 0 ? {
 				sql: `${matchClause} DESC`,
-				params: [text]
+				params: [term]
 			} : void 0,
 			pkColumns: this._table.primaryKeys.map((key) => this._table.physicalPath(key))
 		});
@@ -2137,10 +2158,10 @@ var MysqlAdapter = class MysqlAdapter extends BaseDbAdapter {
 			params: [...where.params, ...params],
 			rank
 		});
-		if (n === void 0) return textFields.length === 0 ? withWhere(EMPTY_OR.sql, []) : withWhere(matchClause, [text]);
+		if (n === void 0) return textFields.length === 0 ? withWhere(EMPTY_OR.sql, []) : withWhere(matchClause, [term]);
 		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)]);
+			const or = orFragment([...textFields.length > 0 ? [matchClause] : [], ...integerFields.map((f) => `${qi(f.name)} = ?`)], [...textFields.length > 0 ? [term] : [], ...integerFields.map(() => n)]);
 			return withWhere(or.sql, or.params);
 		}
 		const table = quoteTableName(this.resolveTableName());
@@ -2149,7 +2170,7 @@ var MysqlAdapter = class MysqlAdapter extends BaseDbAdapter {
 		const params = [];
 		if (textFields.length > 0) {
 			arms.push(`SELECT ${keyList} FROM ${table} WHERE ${matchClause}`);
-			params.push(text);
+			params.push(term);
 		}
 		for (const f of integerFields) {
 			arms.push(`SELECT ${keyList} FROM ${table} WHERE ${qi(f.name)} = ?`);
@@ -2440,6 +2461,37 @@ function similarityToMysqlFn(similarity) {
 function vectorToString(vector) {
 	return `[${vector.join(",")}]`;
 }
+/** InnoDB's default full-text stop words (`INFORMATION_SCHEMA.INNODB_FT_DEFAULT_STOPWORD`). */
+const INNODB_DEFAULT_STOPWORDS = new Set("a about an are as at be by com de en for from how i in is it la of on or that the this to was what when where who will with und www".split(" "));
+/**
+* A search text as a boolean-mode `AGAINST` term with every word required
+* (`@db.index.fulltext.match "all"`, since 0.1.168): `+word` per word, a
+* `"quoted phrase"` stays one required phrase, a trailing `*` keeps its prefix
+* meaning. The user's own boolean operators (`+ - < > ( ) ~ * " @`) are text,
+* not syntax. A word InnoDB does not index by default — shorter than 3
+* characters (`innodb_ft_min_token_size`) or on its default stop-word list —
+* stays optional: requiring it would match no row.
+*/
+function mysqlRequireEveryTerm(text) {
+	const parts = [];
+	for (const match of text.matchAll(/"([^"]*)"|(\S+)/g)) {
+		const phrase = match[1];
+		if (phrase !== void 0) {
+			const clean = phrase.trim();
+			if (clean) parts.push(`+"${clean}"`);
+			continue;
+		}
+		const word = match[2];
+		const core = word.replace(/\*+$/, "");
+		const pieces = core.split(/[+\-<>()~*"@]+/).filter(Boolean);
+		pieces.forEach((piece, i) => {
+			const star = i === pieces.length - 1 && core.length < word.length ? "*" : "";
+			const required = [...piece].length >= 3 && !INNODB_DEFAULT_STOPWORDS.has(piece.toLowerCase());
+			parts.push(`${required ? "+" : ""}${piece}${star}`);
+		});
+	}
+	return parts.join(" ");
+}
 //#endregion
 //#region src/mysql2-driver.ts
 const NO_PARAMS = [];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atscript/db-mysql",
-  "version": "0.1.166",
+  "version": "0.1.168",
   "description": "MySQL adapter for @atscript/db with mysql2 driver support.",
   "keywords": [
     "atscript",
@@ -40,20 +40,22 @@
   "publishConfig": {
     "access": "public"
   },
+  "dependencies": {
+    "@atscript/db-sql-tools": "^0.1.168"
+  },
   "devDependencies": {
-    "@atscript/core": "^0.2.1",
-    "@atscript/typescript": "^0.2.1",
-    "@uniqu/core": "^0.1.15",
+    "@atscript/core": "^0.2.4",
+    "@atscript/typescript": "^0.2.4",
+    "@uniqu/core": "^0.2.0",
     "mysql2": "^3.11.0",
-    "unplugin-atscript": "^0.2.1"
+    "unplugin-atscript": "^0.2.4"
   },
   "peerDependencies": {
-    "@atscript/core": "^0.2.1",
-    "@atscript/typescript": "^0.2.1",
-    "@uniqu/core": "^0.1.15",
+    "@atscript/core": "^0.2.4",
+    "@atscript/typescript": "^0.2.4",
+    "@uniqu/core": "^0.2.0",
     "mysql2": ">=3.0.0",
-    "@atscript/db": "^0.1.166",
-    "@atscript/db-sql-tools": "^0.1.166"
+    "@atscript/db": "^0.1.168"
   },
   "peerDependenciesMeta": {
     "mysql2": {