@atscript/db-mysql 0.1.168 → 0.1.169

package/dist/index.cjs

@@ -675,6 +675,7 @@ var MysqlAdapter = class MysqlAdapter extends _atscript_db.BaseDbAdapter {
 	_replaceColumnsMemo;
 	_fulltextMemo;
 	_searchIndexesMemo;
+	_incrementPkMemo;
 	/**
 	* Schema name for INFORMATION_SCHEMA queries — `@db.schema` of the bound
 	* table, or `null` (→ `DATABASE()`, the pool's database) when the table
@@ -994,7 +995,7 @@ var MysqlAdapter = class MysqlAdapter extends _atscript_db.BaseDbAdapter {
 		const { sql, params } = buildInsert(this.resolveTableName(), data);
 		this._log(sql, params);
 		const result = await this._wrapConstraintError(() => this._exec().run(sql, params));
-		return { insertedId: this._resolveInsertedId(data, result.insertId) };
+		return { insertedId: this._insertedIdOf(data, result.insertId, result.insertId) };
 	}
 	async insertMany(data) {
 		if (data.length === 0) return {
@@ -1072,9 +1073,25 @@ var MysqlAdapter = class MysqlAdapter extends _atscript_db.BaseDbAdapter {
 	}
 	/** Physical column of the single-column AUTO_INCREMENT primary key, if the table has one. */
 	_autoIncrementPk() {
-		const pks = this._table.primaryKeys;
-		if (pks.length !== 1 || !this._incrementFields.has(pks[0])) return void 0;
-		return this._table.getMetadata().physicalPath(pks[0]);
+		const { column, composite } = this._incrementPk();
+		return composite ? void 0 : column;
+	}
+	/**
+	* Physical column of the primary key's `@db.default.increment` part (if any)
+	* and whether the key is composite — computed once per table.
+	*/
+	_incrementPk() {
+		const src = this._table.primaryKeys;
+		let memo = this._incrementPkMemo;
+		if (memo?.src !== src) {
+			const part = src.find((pk) => this._incrementFields.has(pk));
+			memo = this._incrementPkMemo = {
+				src,
+				column: part === void 0 ? void 0 : this._table.physicalPath(part),
+				composite: src.length > 1
+			};
+		}
+		return memo;
 	}
 	/**
 	* Splits `rows` into runs that each map to ONE statement with a derivable
@@ -1164,11 +1181,30 @@ var MysqlAdapter = class MysqlAdapter extends _atscript_db.BaseDbAdapter {
 	async _groupInsertedIds(group, insertId, step) {
 		const first = Number(insertId);
 		const stride = group.generated && group.rows.length > 1 && first > 0 ? await step() : 1;
+		const partId = group.rows.length === 1 ? insertId : void 0;
 		return group.rows.map((row, i) => {
 			const generatedId = first > 0 ? first + i * stride : 0;
-			return group.generated ? generatedId : this._resolveInsertedId(row, generatedId);
+			return group.generated ? generatedId : this._insertedIdOf(row, generatedId, partId);
 		});
 	}
+	/**
+	* The inserted id of `row` (see `_resolveInsertedId`). For a COMPOSITE key
+	* with an AUTO_INCREMENT part, `partId` is what the statement generated for
+	* that part — pass it only when exact (a ONE-row INSERT); a row carrying the
+	* part keeps its own value. An explicit `0` in the part counts as absent:
+	* MySQL generates a value for it (unless `NO_AUTO_VALUE_ON_ZERO`), so only
+	* `partId` knows it — without that the id is `undefined`, never a wrong `0`.
+	*/
+	_insertedIdOf(row, generatedId, partId) {
+		const { column, composite } = this._incrementPk();
+		if (!composite || column === void 0) return this._resolveInsertedId(row, generatedId);
+		const source = isZero(row[column]) ? {
+			...row,
+			[column]: void 0
+		} : row;
+		const part = Number(partId) > 0 ? { [column]: partId } : void 0;
+		return this._resolveInsertedId(source, generatedId, part);
+	}
 	supportsInsertIgnore() {
 		return true;
 	}

package/dist/index.d.cts

@@ -141,6 +141,7 @@ declare class MysqlAdapter extends BaseDbAdapter {
   private _replaceColumnsMemo?;
   private _fulltextMemo?;
   private _searchIndexesMemo?;
+  private _incrementPkMemo?;
   /**
    * Schema name for INFORMATION_SCHEMA queries — `@db.schema` of the bound
    * table, or `null` (→ `DATABASE()`, the pool's database) when the table
@@ -260,6 +261,11 @@ declare class MysqlAdapter extends BaseDbAdapter {
   private _uniformIdGroup;
   /** Physical column of the single-column AUTO_INCREMENT primary key, if the table has one. */
   private _autoIncrementPk;
+  /**
+   * Physical column of the primary key's `@db.default.increment` part (if any)
+   * and whether the key is composite — computed once per table.
+   */
+  private _incrementPk;
   /**
    * Splits `rows` into runs that each map to ONE statement with a derivable
    * id sequence. MySQL reports only the first GENERATED id of a statement, and
@@ -298,6 +304,15 @@ declare class MysqlAdapter extends BaseDbAdapter {
    * count — mode 2, the 8.0 default), explicit rows keep their own value.
    */
   private _groupInsertedIds;
+  /**
+   * The inserted id of `row` (see `_resolveInsertedId`). For a COMPOSITE key
+   * with an AUTO_INCREMENT part, `partId` is what the statement generated for
+   * that part — pass it only when exact (a ONE-row INSERT); a row carrying the
+   * part keeps its own value. An explicit `0` in the part counts as absent:
+   * MySQL generates a value for it (unless `NO_AUTO_VALUE_ON_ZERO`), so only
+   * `partId` knows it — without that the id is `undefined`, never a wrong `0`.
+   */
+  private _insertedIdOf;
   supportsInsertIgnore(): boolean;
   /**
    * Standalone (no caller transaction): per chunk ONE optimistic multi-row

package/dist/index.d.mts

@@ -141,6 +141,7 @@ declare class MysqlAdapter extends BaseDbAdapter {
   private _replaceColumnsMemo?;
   private _fulltextMemo?;
   private _searchIndexesMemo?;
+  private _incrementPkMemo?;
   /**
    * Schema name for INFORMATION_SCHEMA queries — `@db.schema` of the bound
    * table, or `null` (→ `DATABASE()`, the pool's database) when the table
@@ -260,6 +261,11 @@ declare class MysqlAdapter extends BaseDbAdapter {
   private _uniformIdGroup;
   /** Physical column of the single-column AUTO_INCREMENT primary key, if the table has one. */
   private _autoIncrementPk;
+  /**
+   * Physical column of the primary key's `@db.default.increment` part (if any)
+   * and whether the key is composite — computed once per table.
+   */
+  private _incrementPk;
   /**
    * Splits `rows` into runs that each map to ONE statement with a derivable
    * id sequence. MySQL reports only the first GENERATED id of a statement, and
@@ -298,6 +304,15 @@ declare class MysqlAdapter extends BaseDbAdapter {
    * count — mode 2, the 8.0 default), explicit rows keep their own value.
    */
   private _groupInsertedIds;
+  /**
+   * The inserted id of `row` (see `_resolveInsertedId`). For a COMPOSITE key
+   * with an AUTO_INCREMENT part, `partId` is what the statement generated for
+   * that part — pass it only when exact (a ONE-row INSERT); a row carrying the
+   * part keeps its own value. An explicit `0` in the part counts as absent:
+   * MySQL generates a value for it (unless `NO_AUTO_VALUE_ON_ZERO`), so only
+   * `partId` knows it — without that the id is `undefined`, never a wrong `0`.
+   */
+  private _insertedIdOf;
   supportsInsertIgnore(): boolean;
   /**
    * Standalone (no caller transaction): per chunk ONE optimistic multi-row

package/dist/index.mjs

@@ -674,6 +674,7 @@ var MysqlAdapter = class MysqlAdapter extends BaseDbAdapter {
 	_replaceColumnsMemo;
 	_fulltextMemo;
 	_searchIndexesMemo;
+	_incrementPkMemo;
 	/**
 	* Schema name for INFORMATION_SCHEMA queries — `@db.schema` of the bound
 	* table, or `null` (→ `DATABASE()`, the pool's database) when the table
@@ -993,7 +994,7 @@ var MysqlAdapter = class MysqlAdapter extends BaseDbAdapter {
 		const { sql, params } = buildInsert$1(this.resolveTableName(), data);
 		this._log(sql, params);
 		const result = await this._wrapConstraintError(() => this._exec().run(sql, params));
-		return { insertedId: this._resolveInsertedId(data, result.insertId) };
+		return { insertedId: this._insertedIdOf(data, result.insertId, result.insertId) };
 	}
 	async insertMany(data) {
 		if (data.length === 0) return {
@@ -1071,9 +1072,25 @@ var MysqlAdapter = class MysqlAdapter extends BaseDbAdapter {
 	}
 	/** Physical column of the single-column AUTO_INCREMENT primary key, if the table has one. */
 	_autoIncrementPk() {
-		const pks = this._table.primaryKeys;
-		if (pks.length !== 1 || !this._incrementFields.has(pks[0])) return void 0;
-		return this._table.getMetadata().physicalPath(pks[0]);
+		const { column, composite } = this._incrementPk();
+		return composite ? void 0 : column;
+	}
+	/**
+	* Physical column of the primary key's `@db.default.increment` part (if any)
+	* and whether the key is composite — computed once per table.
+	*/
+	_incrementPk() {
+		const src = this._table.primaryKeys;
+		let memo = this._incrementPkMemo;
+		if (memo?.src !== src) {
+			const part = src.find((pk) => this._incrementFields.has(pk));
+			memo = this._incrementPkMemo = {
+				src,
+				column: part === void 0 ? void 0 : this._table.physicalPath(part),
+				composite: src.length > 1
+			};
+		}
+		return memo;
 	}
 	/**
 	* Splits `rows` into runs that each map to ONE statement with a derivable
@@ -1163,11 +1180,30 @@ var MysqlAdapter = class MysqlAdapter extends BaseDbAdapter {
 	async _groupInsertedIds(group, insertId, step) {
 		const first = Number(insertId);
 		const stride = group.generated && group.rows.length > 1 && first > 0 ? await step() : 1;
+		const partId = group.rows.length === 1 ? insertId : void 0;
 		return group.rows.map((row, i) => {
 			const generatedId = first > 0 ? first + i * stride : 0;
-			return group.generated ? generatedId : this._resolveInsertedId(row, generatedId);
+			return group.generated ? generatedId : this._insertedIdOf(row, generatedId, partId);
 		});
 	}
+	/**
+	* The inserted id of `row` (see `_resolveInsertedId`). For a COMPOSITE key
+	* with an AUTO_INCREMENT part, `partId` is what the statement generated for
+	* that part — pass it only when exact (a ONE-row INSERT); a row carrying the
+	* part keeps its own value. An explicit `0` in the part counts as absent:
+	* MySQL generates a value for it (unless `NO_AUTO_VALUE_ON_ZERO`), so only
+	* `partId` knows it — without that the id is `undefined`, never a wrong `0`.
+	*/
+	_insertedIdOf(row, generatedId, partId) {
+		const { column, composite } = this._incrementPk();
+		if (!composite || column === void 0) return this._resolveInsertedId(row, generatedId);
+		const source = isZero(row[column]) ? {
+			...row,
+			[column]: void 0
+		} : row;
+		const part = Number(partId) > 0 ? { [column]: partId } : void 0;
+		return this._resolveInsertedId(source, generatedId, part);
+	}
 	supportsInsertIgnore() {
 		return true;
 	}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atscript/db-mysql",
-  "version": "0.1.168",
+  "version": "0.1.169",
   "description": "MySQL adapter for @atscript/db with mysql2 driver support.",
   "keywords": [
     "atscript",
@@ -41,7 +41,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@atscript/db-sql-tools": "^0.1.168"
+    "@atscript/db-sql-tools": "^0.1.169"
   },
   "devDependencies": {
     "@atscript/core": "^0.2.4",
@@ -55,7 +55,7 @@
     "@atscript/typescript": "^0.2.4",
     "@uniqu/core": "^0.2.0",
     "mysql2": ">=3.0.0",
-    "@atscript/db": "^0.1.168"
+    "@atscript/db": "^0.1.169"
   },
   "peerDependenciesMeta": {
     "mysql2": {