@neverinfamous/mysql-mcp 2.2.0 → 2.3.0

package/src/adapters/mysql/tools/core.ts

@@ -9,12 +9,19 @@ import type { MySQLAdapter } from "../MySQLAdapter.js";
 import type { ToolDefinition, RequestContext } from "../../../types/index.js";
 import {
   ReadQuerySchema,
+  ReadQuerySchemaBase,
   WriteQuerySchema,
+  WriteQuerySchemaBase,
   CreateTableSchema,
+  CreateTableSchemaBase,
   DescribeTableSchema,
+  DescribeTableSchemaBase,
   DropTableSchema,
+  DropTableSchemaBase,
   CreateIndexSchema,
+  CreateIndexSchemaBase,
   GetIndexesSchema,
+  GetIndexesSchemaBase,
   ListTablesSchema,
 } from "../types.js";
 
@@ -69,7 +76,7 @@ function createReadQueryTool(adapter: MySQLAdapter): ToolDefinition {
     description:
       "Execute a read-only SQL query (SELECT). Uses prepared statements for safety.",
     group: "core",
-    inputSchema: ReadQuerySchema,
+    inputSchema: ReadQuerySchemaBase,
     requiredScopes: ["read"],
     annotations: {
       readOnlyHint: true,
@@ -81,16 +88,21 @@ function createReadQueryTool(adapter: MySQLAdapter): ToolDefinition {
         params: queryParams,
         transactionId,
       } = ReadQuerySchema.parse(params);
-      const result = await adapter.executeReadQuery(
-        query,
-        queryParams,
-        transactionId,
-      );
-      return {
-        rows: result.rows,
-        rowCount: result.rows?.length ?? 0,
-        executionTimeMs: result.executionTimeMs,
-      };
+      try {
+        const result = await adapter.executeReadQuery(
+          query,
+          queryParams,
+          transactionId,
+        );
+        return {
+          rows: result.rows,
+          rowCount: result.rows?.length ?? 0,
+          executionTimeMs: result.executionTimeMs,
+        };
+      } catch (err: unknown) {
+        const message = err instanceof Error ? err.message : String(err);
+        return { success: false, error: message.replace(/^.*?:\s*/, "") };
+      }
     },
   };
 }
@@ -105,7 +117,7 @@ function createWriteQueryTool(adapter: MySQLAdapter): ToolDefinition {
     description:
       "Execute a write SQL query (INSERT, UPDATE, DELETE). Uses prepared statements for safety.",
     group: "core",
-    inputSchema: WriteQuerySchema,
+    inputSchema: WriteQuerySchemaBase,
     requiredScopes: ["write"],
     annotations: {
       readOnlyHint: false,
@@ -116,16 +128,21 @@ function createWriteQueryTool(adapter: MySQLAdapter): ToolDefinition {
         params: queryParams,
         transactionId,
       } = WriteQuerySchema.parse(params);
-      const result = await adapter.executeWriteQuery(
-        query,
-        queryParams,
-        transactionId,
-      );
-      return {
-        rowsAffected: result.rowsAffected,
-        lastInsertId: result.lastInsertId?.toString(),
-        executionTimeMs: result.executionTimeMs,
-      };
+      try {
+        const result = await adapter.executeWriteQuery(
+          query,
+          queryParams,
+          transactionId,
+        );
+        return {
+          rowsAffected: result.rowsAffected,
+          lastInsertId: result.lastInsertId?.toString(),
+          executionTimeMs: result.executionTimeMs,
+        };
+      } catch (err: unknown) {
+        const message = err instanceof Error ? err.message : String(err);
+        return { success: false, error: message.replace(/^.*?:\s*/, "") };
+      }
     },
   };
 }
@@ -172,7 +189,7 @@ function createDescribeTableTool(adapter: MySQLAdapter): ToolDefinition {
     description:
       "Get detailed information about a table's structure including columns, types, and constraints.",
     group: "core",
-    inputSchema: DescribeTableSchema,
+    inputSchema: DescribeTableSchemaBase,
     requiredScopes: ["read"],
     annotations: {
       readOnlyHint: true,
@@ -204,7 +221,7 @@ function createCreateTableTool(adapter: MySQLAdapter): ToolDefinition {
     description:
       "Create a new table with specified columns, engine, and charset.",
     group: "core",
-    inputSchema: CreateTableSchema,
+    inputSchema: CreateTableSchemaBase,
     requiredScopes: ["write"],
     annotations: {
       readOnlyHint: false,
@@ -313,7 +330,7 @@ function createDropTableTool(adapter: MySQLAdapter): ToolDefinition {
     title: "MySQL Drop Table",
     description: "Drop (delete) a table from the database.",
     group: "core",
-    inputSchema: DropTableSchema,
+    inputSchema: DropTableSchemaBase,
     requiredScopes: ["admin"],
     annotations: {
       readOnlyHint: false,
@@ -376,7 +393,7 @@ function createGetIndexesTool(adapter: MySQLAdapter): ToolDefinition {
     description:
       "Get all indexes for a table including type, columns, and cardinality.",
     group: "core",
-    inputSchema: GetIndexesSchema,
+    inputSchema: GetIndexesSchemaBase,
     requiredScopes: ["read"],
     annotations: {
       readOnlyHint: true,
@@ -410,7 +427,7 @@ function createCreateIndexTool(adapter: MySQLAdapter): ToolDefinition {
     description:
       "Create an index on a table. Supports BTREE, HASH, FULLTEXT, and SPATIAL index types.",
     group: "core",
-    inputSchema: CreateIndexSchema,
+    inputSchema: CreateIndexSchemaBase,
     requiredScopes: ["write"],
     annotations: {
       readOnlyHint: false,

package/src/adapters/mysql/tools/events.ts

@@ -152,6 +152,22 @@ function createEventCreateTool(adapter: MySQLAdapter): ToolDefinition {
         throw new Error("Invalid event name");
       }
 
+      // Pre-check event existence for informative messaging
+      if (ifNotExists) {
+        const existsCheck = await adapter.executeQuery(
+          "SELECT EVENT_NAME FROM information_schema.EVENTS WHERE EVENT_SCHEMA = DATABASE() AND EVENT_NAME = ?",
+          [name],
+        );
+        if (existsCheck.rows && existsCheck.rows.length > 0) {
+          return {
+            success: true,
+            skipped: true,
+            reason: "Event already exists",
+            eventName: name,
+          };
+        }
+      }
+
       const ifNotExistsClause = ifNotExists ? "IF NOT EXISTS " : "";
       let sql = `CREATE EVENT ${ifNotExistsClause}\`${name}\`\nON SCHEDULE `;
 
@@ -273,6 +289,13 @@ function createEventAlterTool(adapter: MySQLAdapter): ToolDefinition {
         clauses.push(`ON COMPLETION ${onCompletion}`);
       }
 
+      if (newName) {
+        if (!/^[a-zA-Z_][a-zA-Z0-9_]*$/.test(newName)) {
+          throw new Error("Invalid new event name");
+        }
+        clauses.push(`RENAME TO \`${newName}\``);
+      }
+
       if (enabled !== undefined) {
         clauses.push(enabled ? "ENABLE" : "DISABLE");
       }
@@ -285,13 +308,6 @@ function createEventAlterTool(adapter: MySQLAdapter): ToolDefinition {
         clauses.push(`DO ${body}`);
       }
 
-      if (newName) {
-        if (!/^[a-zA-Z_][a-zA-Z0-9_]*$/.test(newName)) {
-          throw new Error("Invalid new event name");
-        }
-        clauses.push(`RENAME TO \`${newName}\``);
-      }
-
       if (clauses.length === 0) {
         throw new Error("No modifications specified");
       }

package/src/adapters/mysql/tools/json/__tests__/helpers.test.ts

@@ -54,6 +54,29 @@ describe("JSON Helper Tools", () => {
     });
   });
 
+  describe("createJsonSearchTool", () => {
+    it("should search JSON by value", async () => {
+      mockAdapter.executeReadQuery.mockResolvedValue(
+        createMockQueryResult([{ id: 1, match_path: "$[0]" }]),
+      );
+
+      const tool = createJsonSearchTool(mockAdapter as unknown as MySQLAdapter);
+      await tool.handler(
+        {
+          table: "data",
+          column: "json_col",
+          searchValue: "test",
+        },
+        mockContext,
+      );
+
+      const call = mockAdapter.executeReadQuery.mock.calls[0][0] as string;
+      expect(call).toContain("JSON_SEARCH");
+      expect(call).toContain("SELECT id, `json_col`");
+      expect(call).not.toContain("SELECT *");
+    });
+  });
+
   describe("createJsonUpdateTool", () => {
     it("should update JSON value by ID", async () => {
       mockAdapter.executeWriteQuery.mockResolvedValue({
@@ -76,28 +99,27 @@ describe("JSON Helper Tools", () => {
       expect(mockAdapter.executeWriteQuery).toHaveBeenCalled();
       expect(result.success).toBe(true);
     });
-  });
 
-  describe("createJsonSearchTool", () => {
-    it("should search JSON by value", async () => {
-      mockAdapter.executeReadQuery.mockResolvedValue(
-        createMockQueryResult([{ id: 1, match_path: "$[0]" }]),
-      );
+    it("should return reason when no row matches the ID", async () => {
+      mockAdapter.executeWriteQuery.mockResolvedValue({
+        rowsAffected: 0,
+        insertId: 0,
+      });
 
-      const tool = createJsonSearchTool(mockAdapter as unknown as MySQLAdapter);
-      await tool.handler(
+      const tool = createJsonUpdateTool(mockAdapter as unknown as MySQLAdapter);
+      const result = (await tool.handler(
         {
           table: "data",
           column: "json_col",
-          searchValue: "test",
+          path: "$.a",
+          value: 2,
+          id: 999,
         },
         mockContext,
-      );
+      )) as { success: boolean; reason: string };
 
-      const call = mockAdapter.executeReadQuery.mock.calls[0][0] as string;
-      expect(call).toContain("JSON_SEARCH");
-      expect(call).toContain("SELECT id, `json_col`");
-      expect(call).not.toContain("SELECT *");
+      expect(result.success).toBe(false);
+      expect(result.reason).toContain("999");
     });
   });
 
@@ -120,6 +142,29 @@ describe("JSON Helper Tools", () => {
       expect(mockAdapter.executeReadQuery).toHaveBeenCalled();
       expect(result.valid).toBe(true);
     });
+
+    it("should pass bare strings directly without auto-conversion", async () => {
+      mockAdapter.executeReadQuery.mockResolvedValue(
+        createMockQueryResult([{ is_valid: 0 }]),
+      );
+
+      const tool = createJsonValidateTool(
+        mockAdapter as unknown as MySQLAdapter,
+      );
+      const result = (await tool.handler(
+        {
+          value: "hello",
+        },
+        mockContext,
+      )) as { valid: boolean };
+
+      expect(mockAdapter.executeReadQuery).toHaveBeenCalled();
+      // The bare string "hello" should be passed directly, not wrapped
+      const sqlParam = mockAdapter.executeReadQuery.mock
+        .calls[0][1] as string[];
+      expect(sqlParam[0]).toBe("hello");
+      expect(result.valid).toBe(false);
+    });
   });
 
   describe("P154 Graceful Error Handling", () => {

package/src/adapters/mysql/tools/json/core.ts

@@ -12,9 +12,13 @@ import type {
 } from "../../../../types/index.js";
 import {
   JsonExtractSchema,
+  JsonExtractSchemaBase,
   JsonSetSchema,
+  JsonSetSchemaBase,
   JsonContainsSchema,
+  JsonContainsSchemaBase,
   JsonKeysSchema,
+  JsonKeysSchemaBase,
 } from "../../types.js";
 import { z } from "zod";
 import {
@@ -57,7 +61,7 @@ export function createJsonExtractTool(adapter: MySQLAdapter): ToolDefinition {
     description:
       "Extract values from JSON columns using JSON path expressions.",
     group: "json",
-    inputSchema: JsonExtractSchema,
+    inputSchema: JsonExtractSchemaBase,
     requiredScopes: ["read"],
     annotations: {
       readOnlyHint: true,
@@ -100,7 +104,7 @@ export function createJsonSetTool(adapter: MySQLAdapter): ToolDefinition {
     title: "MySQL JSON Set",
     description: "Set or update values in JSON columns at specified paths.",
     group: "json",
-    inputSchema: JsonSetSchema,
+    inputSchema: JsonSetSchemaBase,
     requiredScopes: ["write"],
     annotations: {
       readOnlyHint: false,
@@ -286,7 +290,7 @@ export function createJsonContainsTool(adapter: MySQLAdapter): ToolDefinition {
     title: "MySQL JSON Contains",
     description: "Find rows where JSON column contains a specified value.",
     group: "json",
-    inputSchema: JsonContainsSchema,
+    inputSchema: JsonContainsSchemaBase,
     requiredScopes: ["read"],
     annotations: {
       readOnlyHint: true,
@@ -332,7 +336,7 @@ export function createJsonKeysTool(adapter: MySQLAdapter): ToolDefinition {
     title: "MySQL JSON Keys",
     description: "Get the keys of a JSON object at the specified path.",
     group: "json",
-    inputSchema: JsonKeysSchema,
+    inputSchema: JsonKeysSchemaBase,
     requiredScopes: ["read"],
     annotations: {
       readOnlyHint: true,

package/src/adapters/mysql/tools/json/helpers.ts

@@ -10,7 +10,11 @@ import type {
   ToolDefinition,
   RequestContext,
 } from "../../../../types/index.js";
-import { JsonSearchSchema, JsonValidateSchema } from "../../types.js";
+import {
+  JsonSearchSchema,
+  JsonSearchSchemaBase,
+  JsonValidateSchema,
+} from "../../types.js";
 import { z } from "zod";
 import {
   validateQualifiedIdentifier,
@@ -133,7 +137,13 @@ export function createJsonUpdateTool(adapter: MySQLAdapter): ToolDefinition {
           jsonValue,
           id,
         ]);
-        return { success: result.rowsAffected === 1 };
+        if (result.rowsAffected === 0) {
+          return {
+            success: false,
+            reason: `No row found with ${idColumn} = ${id}`,
+          };
+        }
+        return { success: true };
       } catch (error) {
         const msg = error instanceof Error ? error.message : String(error);
         if (msg.includes("doesn't exist")) {
@@ -152,7 +162,7 @@ export function createJsonSearchTool(adapter: MySQLAdapter): ToolDefinition {
     description:
       "Search for a string value in JSON columns and return matching paths.",
     group: "json",
-    inputSchema: JsonSearchSchema,
+    inputSchema: JsonSearchSchemaBase,
     requiredScopes: ["read"],
     annotations: {
       readOnlyHint: true,

package/src/adapters/mysql/tools/partitioning.ts

@@ -5,13 +5,18 @@
  * 4 tools: partition_info, add_partition, drop_partition, reorganize_partition.
  */
 
+import { ZodError } from "zod";
 import type { MySQLAdapter } from "../MySQLAdapter.js";
 import type { ToolDefinition, RequestContext } from "../../../types/index.js";
 import {
   PartitionInfoSchema,
+  PartitionInfoSchemaBase,
   AddPartitionSchema,
+  AddPartitionSchemaBase,
   DropPartitionSchema,
+  DropPartitionSchemaBase,
   ReorganizePartitionSchema,
+  ReorganizePartitionSchemaBase,
 } from "../types.js";
 
 /**
@@ -32,7 +37,7 @@ function createPartitionInfoTool(adapter: MySQLAdapter): ToolDefinition {
     title: "MySQL Partition Info",
     description: "Get partition information for a table.",
     group: "partitioning",
-    inputSchema: PartitionInfoSchema,
+    inputSchema: PartitionInfoSchemaBase,
     requiredScopes: ["read"],
     annotations: {
       readOnlyHint: true,
@@ -99,7 +104,7 @@ function createAddPartitionTool(adapter: MySQLAdapter): ToolDefinition {
     title: "MySQL Add Partition",
     description: "Add a new partition to a partitioned table.",
     group: "partitioning",
-    inputSchema: AddPartitionSchema,
+    inputSchema: AddPartitionSchemaBase,
     requiredScopes: ["admin"],
     annotations: {
       readOnlyHint: false,
@@ -108,6 +113,16 @@ function createAddPartitionTool(adapter: MySQLAdapter): ToolDefinition {
       const { table, partitionName, partitionType, value } =
         AddPartitionSchema.parse(params);
 
+      // P154: Check if table exists
+      const tableCheck = await adapter.executeQuery(
+        `SELECT TABLE_NAME FROM information_schema.TABLES
+         WHERE TABLE_SCHEMA = DATABASE() AND TABLE_NAME = ?`,
+        [table],
+      );
+      if (!tableCheck.rows || tableCheck.rows.length === 0) {
+        return { exists: false, table };
+      }
+
       let sql: string;
 
       switch (partitionType) {
@@ -171,7 +186,7 @@ function createDropPartitionTool(adapter: MySQLAdapter): ToolDefinition {
     description:
       "Drop a partition from a partitioned table. Warning: This deletes all data in the partition!",
     group: "partitioning",
-    inputSchema: DropPartitionSchema,
+    inputSchema: DropPartitionSchemaBase,
     requiredScopes: ["admin"],
     annotations: {
       readOnlyHint: false,
@@ -180,6 +195,16 @@ function createDropPartitionTool(adapter: MySQLAdapter): ToolDefinition {
     handler: async (params: unknown, _context: RequestContext) => {
       const { table, partitionName } = DropPartitionSchema.parse(params);
 
+      // P154: Check if table exists
+      const tableCheck = await adapter.executeQuery(
+        `SELECT TABLE_NAME FROM information_schema.TABLES
+         WHERE TABLE_SCHEMA = DATABASE() AND TABLE_NAME = ?`,
+        [table],
+      );
+      if (!tableCheck.rows || tableCheck.rows.length === 0) {
+        return { exists: false, table };
+      }
+
       try {
         await adapter.executeQuery(
           `ALTER TABLE \`${table}\` DROP PARTITION \`${partitionName}\``,
@@ -225,14 +250,36 @@ function createReorganizePartitionTool(adapter: MySQLAdapter): ToolDefinition {
     title: "MySQL Reorganize Partition",
     description: "Reorganize partitions by splitting or merging them.",
     group: "partitioning",
-    inputSchema: ReorganizePartitionSchema,
+    inputSchema: ReorganizePartitionSchemaBase,
     requiredScopes: ["admin"],
     annotations: {
       readOnlyHint: false,
     },
     handler: async (params: unknown, _context: RequestContext) => {
-      const { table, fromPartitions, partitionType, toPartitions } =
-        ReorganizePartitionSchema.parse(params);
+      let parsed;
+      try {
+        parsed = ReorganizePartitionSchema.parse(params);
+      } catch (error) {
+        if (error instanceof ZodError) {
+          return {
+            success: false,
+            error:
+              "HASH/KEY partitions cannot be reorganized. Only RANGE and LIST partition types support REORGANIZE PARTITION.",
+          };
+        }
+        throw error;
+      }
+      const { table, fromPartitions, partitionType, toPartitions } = parsed;
+
+      // P154: Check if table exists
+      const tableCheck = await adapter.executeQuery(
+        `SELECT TABLE_NAME FROM information_schema.TABLES
+         WHERE TABLE_SCHEMA = DATABASE() AND TABLE_NAME = ?`,
+        [table],
+      );
+      if (!tableCheck.rows || tableCheck.rows.length === 0) {
+        return { exists: false, table };
+      }
 
       const fromList = fromPartitions.map((p) => `\`${p}\``).join(", ");
       const toList = toPartitions