@mastra/mysql 0.10.0 → 0.10.1-alpha.0

package/dist/index.js

@@ -1883,6 +1883,17 @@ function parseOptionalJSON(value, emptyValue) {
 function jsonArg(value) {
 	return value === void 0 || value === null ? null : JSON.stringify(value);
 }
+function jsonDataArg(value) {
+	return value === void 0 ? null : JSON.stringify(value);
+}
+const ITEM_SELECT_COLUMNS = Object.keys(DATASET_ITEMS_SCHEMA).map((column) => {
+	const name = quoteIdentifier(column, "column name");
+	return [
+		"input",
+		"groundTruth",
+		"expectedTrajectory"
+	].includes(column) ? `CAST(${name} AS CHAR CHARACTER SET utf8mb4) AS ${name}` : name;
+}).join(", ");
 var DatasetsMySQL = class DatasetsMySQL extends DatasetsStorage {
 	pool;
 	operations;
@@ -2031,15 +2042,15 @@ var DatasetsMySQL = class DatasetsMySQL extends DatasetsStorage {
 		return {
 			id: row.id,
 			name: row.name,
-			description: row.description,
+			description: row.description ?? void 0,
 			metadata: parseJSON$3(row.metadata),
 			inputSchema: parseJSON$3(row.inputSchema),
 			groundTruthSchema: parseJSON$3(row.groundTruthSchema),
 			requestContextSchema: parseJSON$3(row.requestContextSchema),
-			tags: parseJSON$3(row.tags) ?? null,
-			targetType: row.targetType ?? null,
-			targetIds: parseJSON$3(row.targetIds) ?? null,
-			scorerIds: parseJSON$3(row.scorerIds) ?? null,
+			tags: parseJSON$3(row.tags),
+			targetType: row.targetType ?? void 0,
+			targetIds: parseJSON$3(row.targetIds),
+			scorerIds: parseJSON$3(row.scorerIds),
 			version: row.version,
 			organizationId: row.organizationId ?? null,
 			projectId: row.projectId ?? null,
@@ -2140,9 +2151,9 @@ var DatasetsMySQL = class DatasetsMySQL extends DatasetsStorage {
 				inputSchema: input.inputSchema ?? void 0,
 				groundTruthSchema: input.groundTruthSchema ?? void 0,
 				requestContextSchema: input.requestContextSchema ?? void 0,
-				targetType: input.targetType ?? null,
-				targetIds: input.targetIds ?? null,
-				scorerIds: input.scorerIds ?? null,
+				targetType: input.targetType ?? void 0,
+				targetIds: input.targetIds ?? void 0,
+				scorerIds: input.scorerIds ?? void 0,
 				version: 0,
 				organizationId: input.organizationId ?? null,
 				projectId: input.projectId ?? null,
@@ -2222,10 +2233,10 @@ var DatasetsMySQL = class DatasetsMySQL extends DatasetsStorage {
 				inputSchema: (args.inputSchema !== void 0 ? args.inputSchema : existing.inputSchema) ?? void 0,
 				groundTruthSchema: (args.groundTruthSchema !== void 0 ? args.groundTruthSchema : existing.groundTruthSchema) ?? void 0,
 				requestContextSchema: (args.requestContextSchema !== void 0 ? args.requestContextSchema : existing.requestContextSchema) ?? void 0,
-				tags: (args.tags !== void 0 ? args.tags : existing.tags) ?? null,
-				targetType: (args.targetType !== void 0 ? args.targetType : existing.targetType) ?? null,
-				targetIds: (args.targetIds !== void 0 ? args.targetIds : existing.targetIds) ?? null,
-				scorerIds: (args.scorerIds !== void 0 ? args.scorerIds : existing.scorerIds) ?? null,
+				tags: (args.tags !== void 0 ? args.tags : existing.tags) ?? void 0,
+				targetType: (args.targetType !== void 0 ? args.targetType : existing.targetType) ?? void 0,
+				targetIds: (args.targetIds !== void 0 ? args.targetIds : existing.targetIds) ?? void 0,
+				scorerIds: (args.scorerIds !== void 0 ? args.scorerIds : existing.scorerIds) ?? void 0,
 				updatedAt: data.updatedAt
 			};
 		} catch (error) {
@@ -2385,8 +2396,8 @@ var DatasetsMySQL = class DatasetsMySQL extends DatasetsStorage {
 				newVersion,
 				parentOrganizationId,
 				parentProjectId,
-				jsonArg(args.input),
-				jsonArg(args.groundTruth),
+				jsonDataArg(args.input),
+				jsonDataArg(args.groundTruth),
 				args.unmockedToolPolicy ?? null,
 				jsonArg(args.scorerIds),
 				jsonArg(args.metadata),
@@ -2437,7 +2448,7 @@ var DatasetsMySQL = class DatasetsMySQL extends DatasetsStorage {
 			const tableItemsName = formatTableName(TABLE_DATASET_ITEMS);
 			const tableVersionsName = formatTableName(TABLE_DATASET_VERSIONS);
 			await connection.execute(`SELECT id FROM ${tableDatasetsName} WHERE id = ? FOR UPDATE`, [args.datasetId]);
-			const [itemRows] = await connection.execute(`SELECT * FROM ${tableItemsName} WHERE id = ? AND validTo IS NULL AND isDeleted = 0`, [args.id]);
+			const [itemRows] = await connection.execute(`SELECT ${ITEM_SELECT_COLUMNS} FROM ${tableItemsName} WHERE id = ? AND validTo IS NULL AND isDeleted = 0`, [args.id]);
 			const itemRow = itemRows[0];
 			const existing = itemRow ? this.mapItem(itemRow) : null;
 			if (!existing) throw new MastraError({
@@ -2466,9 +2477,9 @@ var DatasetsMySQL = class DatasetsMySQL extends DatasetsStorage {
 				},
 				text: `Purged dataset item cannot be updated: ${args.id}`
 			});
-			const mergedInput = args.input ?? existing.input;
-			const mergedGroundTruth = args.groundTruth ?? existing.groundTruth;
-			const mergedExpectedTrajectory = args.expectedTrajectory ?? existing.expectedTrajectory;
+			const mergedInput = args.input !== void 0 ? args.input : existing.input;
+			const mergedGroundTruth = args.groundTruth !== void 0 ? args.groundTruth : existing.groundTruth;
+			const mergedExpectedTrajectory = args.expectedTrajectory !== void 0 ? args.expectedTrajectory : existing.expectedTrajectory;
 			const mergedToolMocks = args.toolMocks ?? existing.toolMocks;
 			const mergedUnmockedToolPolicy = args.unmockedToolPolicy ?? existing.unmockedToolPolicy;
 			const mergedScorerIds = args.scorerIds !== void 0 ? args.scorerIds ?? void 0 : existing.scorerIds;
@@ -2489,9 +2500,9 @@ var DatasetsMySQL = class DatasetsMySQL extends DatasetsStorage {
 				existing.externalId ?? null,
 				parentOrganizationId,
 				parentProjectId,
-				jsonArg(mergedInput),
-				jsonArg(mergedGroundTruth),
-				jsonArg(mergedExpectedTrajectory),
+				jsonDataArg(mergedInput),
+				jsonDataArg(mergedGroundTruth),
+				jsonDataArg(mergedExpectedTrajectory),
 				jsonArg(mergedToolMocks),
 				mergedUnmockedToolPolicy ?? null,
 				jsonArg(mergedScorerIds),
@@ -2546,7 +2557,7 @@ var DatasetsMySQL = class DatasetsMySQL extends DatasetsStorage {
 			const tableItemsName = formatTableName(TABLE_DATASET_ITEMS);
 			const tableVersionsName = formatTableName(TABLE_DATASET_VERSIONS);
 			await connection.execute(`SELECT id FROM ${tableDatasetsName} WHERE id = ? FOR UPDATE`, [datasetId]);
-			const [itemRows] = await connection.execute(`SELECT * FROM ${tableItemsName} WHERE id = ? AND validTo IS NULL AND isDeleted = 0`, [id]);
+			const [itemRows] = await connection.execute(`SELECT ${ITEM_SELECT_COLUMNS} FROM ${tableItemsName} WHERE id = ? AND validTo IS NULL AND isDeleted = 0`, [id]);
 			const itemRow = itemRows[0];
 			const existing = itemRow ? this.mapItem(itemRow) : null;
 			if (!existing) {
@@ -2577,9 +2588,9 @@ var DatasetsMySQL = class DatasetsMySQL extends DatasetsStorage {
 				existing.externalId ?? null,
 				parentOrganizationId,
 				parentProjectId,
-				jsonArg(existing.input),
-				jsonArg(existing.groundTruth),
-				jsonArg(existing.expectedTrajectory),
+				jsonDataArg(existing.input),
+				jsonDataArg(existing.groundTruth),
+				jsonDataArg(existing.expectedTrajectory),
 				jsonArg(existing.toolMocks),
 				existing.unmockedToolPolicy ?? null,
 				jsonArg(existing.scorerIds),
@@ -2659,12 +2670,12 @@ var DatasetsMySQL = class DatasetsMySQL extends DatasetsStorage {
 		try {
 			const tableItemsName = formatTableName(TABLE_DATASET_ITEMS);
 			let rows;
-			if (args.datasetVersion !== void 0) [rows] = await this.pool.execute(`SELECT * FROM ${tableItemsName} WHERE \`id\` = ? AND \`datasetVersion\` <= ? AND (\`validTo\` IS NULL OR \`validTo\` > ?) AND \`isDeleted\` = 0 ORDER BY \`datasetVersion\` DESC LIMIT 1`, [
+			if (args.datasetVersion !== void 0) [rows] = await this.pool.execute(`SELECT ${ITEM_SELECT_COLUMNS} FROM ${tableItemsName} WHERE \`id\` = ? AND \`datasetVersion\` <= ? AND (\`validTo\` IS NULL OR \`validTo\` > ?) AND \`isDeleted\` = 0 ORDER BY \`datasetVersion\` DESC LIMIT 1`, [
 				args.id,
 				args.datasetVersion,
 				args.datasetVersion
 			]);
-			else [rows] = await this.pool.execute(`SELECT * FROM ${tableItemsName} WHERE \`id\` = ? AND \`validTo\` IS NULL AND \`isDeleted\` = 0`, [args.id]);
+			else [rows] = await this.pool.execute(`SELECT ${ITEM_SELECT_COLUMNS} FROM ${tableItemsName} WHERE \`id\` = ? AND \`validTo\` IS NULL AND \`isDeleted\` = 0`, [args.id]);
 			return rows.length > 0 ? this.mapItem(rows[0]) : null;
 		} catch (error) {
 			throw new MastraError({
@@ -2677,7 +2688,7 @@ var DatasetsMySQL = class DatasetsMySQL extends DatasetsStorage {
 	async getItemsByVersion({ datasetId, version }) {
 		try {
 			const tableItemsName = formatTableName(TABLE_DATASET_ITEMS);
-			const [rows] = await this.pool.execute(`SELECT * FROM ${tableItemsName} WHERE \`datasetId\` = ? AND \`datasetVersion\` <= ? AND (\`validTo\` IS NULL OR \`validTo\` > ?) AND \`isDeleted\` = 0 ORDER BY \`createdAt\` DESC, \`id\` ASC`, [
+			const [rows] = await this.pool.execute(`SELECT ${ITEM_SELECT_COLUMNS} FROM ${tableItemsName} WHERE \`datasetId\` = ? AND \`datasetVersion\` <= ? AND (\`validTo\` IS NULL OR \`validTo\` > ?) AND \`isDeleted\` = 0 ORDER BY \`createdAt\` DESC, \`id\` ASC`, [
 				datasetId,
 				version,
 				version
@@ -2694,7 +2705,7 @@ var DatasetsMySQL = class DatasetsMySQL extends DatasetsStorage {
 	async getItemHistory(itemId) {
 		try {
 			const tableItemsName = formatTableName(TABLE_DATASET_ITEMS);
-			const [rows] = await this.pool.execute(`SELECT * FROM ${tableItemsName} WHERE \`id\` = ? ORDER BY \`datasetVersion\` DESC`, [itemId]);
+			const [rows] = await this.pool.execute(`SELECT ${ITEM_SELECT_COLUMNS} FROM ${tableItemsName} WHERE \`id\` = ? ORDER BY \`datasetVersion\` DESC`, [itemId]);
 			return rows.map((row) => this.mapItemFull(row));
 		} catch (error) {
 			throw new MastraError({
@@ -2751,7 +2762,7 @@ var DatasetsMySQL = class DatasetsMySQL extends DatasetsStorage {
 			const perPage = normalizePerPage(perPageInput, 100);
 			const { offset, perPage: perPageForResponse } = calculatePagination(page, perPageInput, perPage);
 			const limitValue = perPageInput === false ? total : perPage;
-			const [rows] = await this.pool.execute(`SELECT * FROM ${tableItemsName}${whereSql} ORDER BY ${quoteIdentifier(orderBy.field, "column name")} ${orderBy.direction}, \`id\` ASC LIMIT ${limitValue} OFFSET ${offset}`, params);
+			const [rows] = await this.pool.execute(`SELECT ${ITEM_SELECT_COLUMNS} FROM ${tableItemsName}${whereSql} ORDER BY ${quoteIdentifier(orderBy.field, "column name")} ${orderBy.direction}, \`id\` ASC LIMIT ${limitValue} OFFSET ${offset}`, params);
 			return {
 				items: rows.map((row) => this.mapItem(row)),
 				pagination: {
@@ -2862,7 +2873,7 @@ var DatasetsMySQL = class DatasetsMySQL extends DatasetsStorage {
 			let historyRows = [];
 			if (externalIds.length > 0) {
 				const placeholders = externalIds.map(() => "?").join(", ");
-				const [rows] = await connection.execute(`SELECT * FROM ${tableItemsName} WHERE \`datasetId\` = ? AND \`externalId\` IN (${placeholders}) ORDER BY \`datasetVersion\` ASC`, [input.datasetId, ...externalIds]);
+				const [rows] = await connection.execute(`SELECT ${ITEM_SELECT_COLUMNS} FROM ${tableItemsName} WHERE \`datasetId\` = ? AND \`externalId\` IN (${placeholders}) ORDER BY \`datasetVersion\` ASC`, [input.datasetId, ...externalIds]);
 				historyRows = rows.map((row) => this.mapItemFull(row));
 			}
 			const plan = this.planDatasetItemBatch(input.items, historyRows, randomUUID);
@@ -2883,9 +2894,9 @@ var DatasetsMySQL = class DatasetsMySQL extends DatasetsStorage {
 					item.externalId ?? null,
 					dataset.organizationId ?? null,
 					dataset.projectId ?? null,
-					jsonArg(item.input),
-					jsonArg(item.groundTruth),
-					jsonArg(item.expectedTrajectory),
+					jsonDataArg(item.input),
+					jsonDataArg(item.groundTruth),
+					jsonDataArg(item.expectedTrajectory),
 					jsonArg(item.toolMocks),
 					item.unmockedToolPolicy ?? null,
 					jsonArg(item.scorerIds),
@@ -2946,7 +2957,7 @@ var DatasetsMySQL = class DatasetsMySQL extends DatasetsStorage {
 			await connection.execute(`SELECT id FROM ${tableDatasetsName} WHERE id = ? FOR UPDATE`, [input.datasetId]);
 			const currentItems = [];
 			for (const itemId of input.itemIds) {
-				const [itemRows] = await connection.execute(`SELECT * FROM ${tableItemsName} WHERE id = ? AND validTo IS NULL AND isDeleted = 0`, [itemId]);
+				const [itemRows] = await connection.execute(`SELECT ${ITEM_SELECT_COLUMNS} FROM ${tableItemsName} WHERE id = ? AND validTo IS NULL AND isDeleted = 0`, [itemId]);
 				const row = itemRows[0];
 				const item = row ? this.mapItem(row) : null;
 				if (item && item.datasetId === input.datasetId) currentItems.push(item);
@@ -2969,9 +2980,9 @@ var DatasetsMySQL = class DatasetsMySQL extends DatasetsStorage {
 					item.externalId ?? null,
 					parentOrganizationId,
 					parentProjectId,
-					jsonArg(item.input),
-					jsonArg(item.groundTruth),
-					jsonArg(item.expectedTrajectory),
+					jsonDataArg(item.input),
+					jsonDataArg(item.groundTruth),
+					jsonDataArg(item.expectedTrajectory),
 					jsonArg(item.toolMocks),
 					item.unmockedToolPolicy ?? null,
 					jsonArg(item.scorerIds),