@berthojoris/mcp-mysql-server 1.10.3 → 1.10.4

package/dist/mcp-server.js

@@ -3095,11 +3095,7 @@ server.setRequestHandler(types_js_1.CallToolRequestSchema, async (request) => {
         }
         // Handle the result based on status
         if (result.status === "error") {
-            // Include query log in error response if available
             let errorText = `Error: ${"error" in result ? result.error : "Unknown error"}`;
-            if ("queryLog" in result && result.queryLog) {
-                errorText += `\n\n${result.queryLog}`;
-            }
             return {
                 content: [
                     {
@@ -3136,23 +3132,6 @@ server.setRequestHandler(types_js_1.CallToolRequestSchema, async (request) => {
             // Fallback
             responseData = result;
         }
-        // NEW APPROACH: Wrap the data with SQL query as part of the response structure
-        // This forces the LLM to see and describe the SQL query as part of the data
-        if ("queryLog" in result && result.queryLog) {
-            const wrappedResponse = {
-                "⚠️ IMPORTANT_INSTRUCTION_TO_ASSISTANT": "ALWAYS display the SQL query execution details below to the user in your response. This is critical information that users need to see.",
-                "⚠️ SQL_QUERY_EXECUTED": result.queryLog,
-                "📊 RESULTS": responseData,
-            };
-            return {
-                content: [
-                    {
-                        type: "text",
-                        text: JSON.stringify(wrappedResponse, null, 2),
-                    },
-                ],
-            };
-        }
         // If no query log, return data as before
         return {
             content: [

package/dist/tools/backupRestoreTools.d.ts

@@ -1,4 +1,4 @@
-import SecurityLayer from '../security/securityLayer';
+import SecurityLayer from "../security/securityLayer";
 /**
  * Backup and Restore Tools for MySQL MCP Server
  * Provides database backup (SQL dump generation) and restore functionality
@@ -25,7 +25,6 @@ export declare class BackupRestoreTools {
         status: string;
         data?: any;
         error?: string;
-        queryLog?: string;
     }>;
     /**
      * Backup a single table to SQL dump format
@@ -39,7 +38,6 @@ export declare class BackupRestoreTools {
         status: string;
         data?: any;
         error?: string;
-        queryLog?: string;
     }>;
     /**
      * Backup entire database schema and optionally data
@@ -53,7 +51,6 @@ export declare class BackupRestoreTools {
         status: string;
         data?: any;
         error?: string;
-        queryLog?: string;
     }>;
     /**
      * Restore database from SQL dump
@@ -67,7 +64,6 @@ export declare class BackupRestoreTools {
         status: string;
         data?: any;
         error?: string;
-        queryLog?: string;
     }>;
     /**
      * Parse SQL dump into individual statements
@@ -86,6 +82,5 @@ export declare class BackupRestoreTools {
         status: string;
         data?: any;
         error?: string;
-        queryLog?: string;
     }>;
 }

package/dist/tools/backupRestoreTools.js

@@ -23,20 +23,20 @@ class BackupRestoreTools {
         if (!connectedDatabase) {
             return {
                 valid: false,
-                database: '',
-                error: 'No database configured. Please specify a database in your connection settings.'
+                database: "",
+                error: "No database configured. Please specify a database in your connection settings.",
             };
         }
         if (requestedDatabase && requestedDatabase !== connectedDatabase) {
             return {
                 valid: false,
-                database: '',
-                error: `Access denied: You are connected to '${connectedDatabase}' but requested '${requestedDatabase}'. Cross-database access is not permitted.`
+                database: "",
+                error: `Access denied: You are connected to '${connectedDatabase}' but requested '${requestedDatabase}'. Cross-database access is not permitted.`,
             };
         }
         return {
             valid: true,
-            database: connectedDatabase
+            database: connectedDatabase,
         };
     }
     /**
@@ -44,26 +44,26 @@ class BackupRestoreTools {
      */
     escapeValue(value) {
         if (value === null)
-            return 'NULL';
-        if (typeof value === 'number')
+            return "NULL";
+        if (typeof value === "number")
             return String(value);
-        if (typeof value === 'boolean')
-            return value ? '1' : '0';
+        if (typeof value === "boolean")
+            return value ? "1" : "0";
         if (value instanceof Date) {
-            return `'${value.toISOString().slice(0, 19).replace('T', ' ')}'`;
+            return `'${value.toISOString().slice(0, 19).replace("T", " ")}'`;
         }
         if (Buffer.isBuffer(value)) {
-            return `X'${value.toString('hex')}'`;
+            return `X'${value.toString("hex")}'`;
         }
         // Escape string
         const escaped = String(value)
-            .replace(/\\/g, '\\\\')
+            .replace(/\\/g, "\\\\")
             .replace(/'/g, "\\'")
             .replace(/"/g, '\\"')
-            .replace(/\n/g, '\\n')
-            .replace(/\r/g, '\\r')
-            .replace(/\t/g, '\\t')
-            .replace(/\0/g, '\\0');
+            .replace(/\n/g, "\\n")
+            .replace(/\r/g, "\\r")
+            .replace(/\t/g, "\\t")
+            .replace(/\0/g, "\\0");
         return `'${escaped}'`;
     }
     /**
@@ -75,37 +75,34 @@ class BackupRestoreTools {
             // Validate database access
             const dbValidation = this.validateDatabaseAccess(database);
             if (!dbValidation.valid) {
-                return { status: 'error', error: dbValidation.error };
+                return { status: "error", error: dbValidation.error };
             }
             // Validate table name
             const tableValidation = this.security.validateIdentifier(table_name);
             if (!tableValidation.valid) {
-                return { status: 'error', error: tableValidation.error };
+                return { status: "error", error: tableValidation.error };
             }
             const escapedTable = this.security.escapeIdentifier(table_name);
             const query = `SHOW CREATE TABLE ${escapedTable}`;
             const results = await this.db.query(query);
             if (results.length === 0) {
                 return {
-                    status: 'error',
+                    status: "error",
                     error: `Table '${table_name}' not found`,
-                    queryLog: this.db.getFormattedQueryLogs(1)
                 };
             }
             return {
-                status: 'success',
+                status: "success",
                 data: {
                     table_name: table_name,
-                    create_statement: results[0]['Create Table']
+                    create_statement: results[0]["Create Table"],
                 },
-                queryLog: this.db.getFormattedQueryLogs(1)
             };
         }
         catch (error) {
             return {
-                status: 'error',
+                status: "error",
                 error: error.message,
-                queryLog: this.db.getFormattedQueryLogs(1)
             };
         }
     }
@@ -114,19 +111,19 @@ class BackupRestoreTools {
      */
     async backupTable(params) {
         try {
-            const { table_name, include_data = true, include_drop = true, database } = params;
+            const { table_name, include_data = true, include_drop = true, database, } = params;
             // Validate database access
             const dbValidation = this.validateDatabaseAccess(database);
             if (!dbValidation.valid) {
-                return { status: 'error', error: dbValidation.error };
+                return { status: "error", error: dbValidation.error };
             }
             // Validate table name
             const tableValidation = this.security.validateIdentifier(table_name);
             if (!tableValidation.valid) {
-                return { status: 'error', error: tableValidation.error };
+                return { status: "error", error: tableValidation.error };
             }
             const escapedTable = this.security.escapeIdentifier(table_name);
-            let sqlDump = '';
+            let sqlDump = "";
             let queryCount = 0;
             // Add header comment
             sqlDump += `-- MySQL Dump generated by MySQL MCP Server\n`;
@@ -143,12 +140,11 @@ class BackupRestoreTools {
             queryCount++;
             if (createResults.length === 0) {
                 return {
-                    status: 'error',
+                    status: "error",
                     error: `Table '${table_name}' not found`,
-                    queryLog: this.db.getFormattedQueryLogs(queryCount)
                 };
             }
-            sqlDump += `${createResults[0]['Create Table']};\n\n`;
+            sqlDump += `${createResults[0]["Create Table"]};\n\n`;
             // Get table data if requested
             let rowCount = 0;
             if (include_data) {
@@ -158,7 +154,9 @@ class BackupRestoreTools {
                 if (dataResults.length > 0) {
                     rowCount = dataResults.length;
                     const columns = Object.keys(dataResults[0]);
-                    const escapedColumns = columns.map(c => this.security.escapeIdentifier(c)).join(', ');
+                    const escapedColumns = columns
+                        .map((c) => this.security.escapeIdentifier(c))
+                        .join(", ");
                     sqlDump += `-- Data for table ${table_name}\n`;
                     sqlDump += `LOCK TABLES ${escapedTable} WRITE;\n`;
                     sqlDump += `/*!40000 ALTER TABLE ${escapedTable} DISABLE KEYS */;\n\n`;
@@ -166,10 +164,12 @@ class BackupRestoreTools {
                     const batchSize = 100;
                     for (let i = 0; i < dataResults.length; i += batchSize) {
                         const batch = dataResults.slice(i, i + batchSize);
-                        const values = batch.map(row => {
-                            const rowValues = columns.map(col => this.escapeValue(row[col]));
-                            return `(${rowValues.join(', ')})`;
-                        }).join(',\n');
+                        const values = batch
+                            .map((row) => {
+                            const rowValues = columns.map((col) => this.escapeValue(row[col]));
+                            return `(${rowValues.join(", ")})`;
+                        })
+                            .join(",\n");
                         sqlDump += `INSERT INTO ${escapedTable} (${escapedColumns}) VALUES\n${values};\n\n`;
                     }
                     sqlDump += `/*!40000 ALTER TABLE ${escapedTable} ENABLE KEYS */;\n`;
@@ -177,22 +177,20 @@ class BackupRestoreTools {
                 }
             }
             return {
-                status: 'success',
+                status: "success",
                 data: {
                     table_name: table_name,
                     sql_dump: sqlDump,
                     row_count: rowCount,
                     include_data: include_data,
-                    include_drop: include_drop
+                    include_drop: include_drop,
                 },
-                queryLog: this.db.getFormattedQueryLogs(queryCount)
             };
         }
         catch (error) {
             return {
-                status: 'error',
+                status: "error",
                 error: error.message,
-                queryLog: this.db.getFormattedQueryLogs(1)
             };
         }
     }
@@ -201,13 +199,13 @@ class BackupRestoreTools {
      */
     async backupDatabase(params) {
         try {
-            const { include_data = true, include_drop = true, tables, database } = params;
+            const { include_data = true, include_drop = true, tables, database, } = params;
             // Validate database access
             const dbValidation = this.validateDatabaseAccess(database);
             if (!dbValidation.valid) {
-                return { status: 'error', error: dbValidation.error };
+                return { status: "error", error: dbValidation.error };
             }
-            let sqlDump = '';
+            let sqlDump = "";
             let queryCount = 0;
             let totalRows = 0;
             const backedUpTables = [];
@@ -227,7 +225,10 @@ class BackupRestoreTools {
                 for (const tableName of tables) {
                     const validation = this.security.validateIdentifier(tableName);
                     if (!validation.valid) {
-                        return { status: 'error', error: `Invalid table name: ${tableName}` };
+                        return {
+                            status: "error",
+                            error: `Invalid table name: ${tableName}`,
+                        };
                     }
                 }
                 tableList = tables;
@@ -236,7 +237,7 @@ class BackupRestoreTools {
                 const tablesQuery = `SHOW TABLES`;
                 const tablesResult = await this.db.query(tablesQuery);
                 queryCount++;
-                tableList = tablesResult.map(row => Object.values(row)[0]);
+                tableList = tablesResult.map((row) => Object.values(row)[0]);
             }
             // Backup each table
             for (const tableName of tableList) {
@@ -253,7 +254,7 @@ class BackupRestoreTools {
                 const createResults = await this.db.query(createQuery);
                 queryCount++;
                 if (createResults.length > 0) {
-                    sqlDump += `${createResults[0]['Create Table']};\n\n`;
+                    sqlDump += `${createResults[0]["Create Table"]};\n\n`;
                     backedUpTables.push(tableName);
                 }
                 // Get table data if requested
@@ -264,7 +265,9 @@ class BackupRestoreTools {
                     if (dataResults.length > 0) {
                         totalRows += dataResults.length;
                         const columns = Object.keys(dataResults[0]);
-                        const escapedColumns = columns.map(c => this.security.escapeIdentifier(c)).join(', ');
+                        const escapedColumns = columns
+                            .map((c) => this.security.escapeIdentifier(c))
+                            .join(", ");
                         sqlDump += `-- Data for table ${tableName}\n`;
                         sqlDump += `LOCK TABLES ${escapedTable} WRITE;\n`;
                         sqlDump += `/*!40000 ALTER TABLE ${escapedTable} DISABLE KEYS */;\n\n`;
@@ -272,10 +275,12 @@ class BackupRestoreTools {
                         const batchSize = 100;
                         for (let i = 0; i < dataResults.length; i += batchSize) {
                             const batch = dataResults.slice(i, i + batchSize);
-                            const values = batch.map(row => {
-                                const rowValues = columns.map(col => this.escapeValue(row[col]));
-                                return `(${rowValues.join(', ')})`;
-                            }).join(',\n');
+                            const values = batch
+                                .map((row) => {
+                                const rowValues = columns.map((col) => this.escapeValue(row[col]));
+                                return `(${rowValues.join(", ")})`;
+                            })
+                                .join(",\n");
                             sqlDump += `INSERT INTO ${escapedTable} (${escapedColumns}) VALUES\n${values};\n\n`;
                         }
                         sqlDump += `/*!40000 ALTER TABLE ${escapedTable} ENABLE KEYS */;\n`;
@@ -288,7 +293,7 @@ class BackupRestoreTools {
             sqlDump += `SET FOREIGN_KEY_CHECKS=1;\n`;
             sqlDump += `\n-- Dump completed successfully\n`;
             return {
-                status: 'success',
+                status: "success",
                 data: {
                     database: dbValidation.database,
                     sql_dump: sqlDump,
@@ -296,16 +301,14 @@ class BackupRestoreTools {
                     table_count: backedUpTables.length,
                     total_rows: totalRows,
                     include_data: include_data,
-                    include_drop: include_drop
+                    include_drop: include_drop,
                 },
-                queryLog: this.db.getFormattedQueryLogs(queryCount)
             };
         }
         catch (error) {
             return {
-                status: 'error',
+                status: "error",
                 error: error.message,
-                queryLog: this.db.getFormattedQueryLogs(1)
             };
         }
     }
@@ -319,10 +322,10 @@ class BackupRestoreTools {
             // Validate database access
             const dbValidation = this.validateDatabaseAccess(database);
             if (!dbValidation.valid) {
-                return { status: 'error', error: dbValidation.error };
+                return { status: "error", error: dbValidation.error };
             }
             if (!sql_dump || sql_dump.trim().length === 0) {
-                return { status: 'error', error: 'SQL dump content is empty' };
+                return { status: "error", error: "SQL dump content is empty" };
             }
             // Parse SQL statements (split by semicolon, handling edge cases)
             const statements = this.parseSqlStatements(sql_dump);
@@ -332,7 +335,7 @@ class BackupRestoreTools {
             let queryCount = 0;
             for (const statement of statements) {
                 const trimmed = statement.trim();
-                if (!trimmed || trimmed.startsWith('--') || trimmed.startsWith('/*')) {
+                if (!trimmed || trimmed.startsWith("--") || trimmed.startsWith("/*")) {
                     continue; // Skip comments and empty statements
                 }
                 try {
@@ -343,41 +346,38 @@ class BackupRestoreTools {
                 catch (error) {
                     errorCount++;
                     errors.push({
-                        statement: trimmed.substring(0, 200) + (trimmed.length > 200 ? '...' : ''),
-                        error: error.message
+                        statement: trimmed.substring(0, 200) + (trimmed.length > 200 ? "..." : ""),
+                        error: error.message,
                     });
                     if (stop_on_error) {
                         return {
-                            status: 'error',
+                            status: "error",
                             error: `Restore stopped at error: ${error.message}`,
                             data: {
                                 statements_executed: successCount,
                                 statements_failed: errorCount,
-                                errors: errors
+                                errors: errors,
                             },
-                            queryLog: this.db.getFormattedQueryLogs(queryCount)
                         };
                     }
                 }
             }
             return {
-                status: errorCount > 0 ? 'partial' : 'success',
+                status: errorCount > 0 ? "partial" : "success",
                 data: {
                     message: errorCount > 0
                         ? `Restore completed with ${errorCount} errors`
-                        : 'Restore completed successfully',
+                        : "Restore completed successfully",
                     statements_executed: successCount,
                     statements_failed: errorCount,
-                    errors: errors.length > 0 ? errors : undefined
+                    errors: errors.length > 0 ? errors : undefined,
                 },
-                queryLog: this.db.getFormattedQueryLogs(queryCount)
             };
         }
         catch (error) {
             return {
-                status: 'error',
+                status: "error",
                 error: error.message,
-                queryLog: this.db.getFormattedQueryLogs(1)
             };
         }
     }
@@ -386,9 +386,9 @@ class BackupRestoreTools {
      */
     parseSqlStatements(sqlDump) {
         const statements = [];
-        let currentStatement = '';
+        let currentStatement = "";
         let inString = false;
-        let stringChar = '';
+        let stringChar = "";
         let inComment = false;
         let inBlockComment = false;
         for (let i = 0; i < sqlDump.length; i++) {
@@ -396,23 +396,23 @@ class BackupRestoreTools {
             const nextChar = sqlDump[i + 1];
             const prevChar = sqlDump[i - 1];
             // Handle block comments /* */
-            if (!inString && !inComment && char === '/' && nextChar === '*') {
+            if (!inString && !inComment && char === "/" && nextChar === "*") {
                 inBlockComment = true;
                 currentStatement += char;
                 continue;
             }
-            if (inBlockComment && char === '*' && nextChar === '/') {
+            if (inBlockComment && char === "*" && nextChar === "/") {
                 inBlockComment = false;
                 currentStatement += char;
                 continue;
             }
             // Handle line comments --
-            if (!inString && !inBlockComment && char === '-' && nextChar === '-') {
+            if (!inString && !inBlockComment && char === "-" && nextChar === "-") {
                 inComment = true;
                 currentStatement += char;
                 continue;
             }
-            if (inComment && char === '\n') {
+            if (inComment && char === "\n") {
                 inComment = false;
                 currentStatement += char;
                 continue;
@@ -423,25 +423,25 @@ class BackupRestoreTools {
                     inString = true;
                     stringChar = char;
                 }
-                else if (char === stringChar && prevChar !== '\\') {
+                else if (char === stringChar && prevChar !== "\\") {
                     inString = false;
                 }
             }
             // Handle statement terminator
-            if (!inString && !inComment && !inBlockComment && char === ';') {
+            if (!inString && !inComment && !inBlockComment && char === ";") {
                 currentStatement += char;
                 const trimmed = currentStatement.trim();
-                if (trimmed && !trimmed.startsWith('--')) {
+                if (trimmed && !trimmed.startsWith("--")) {
                     statements.push(trimmed);
                 }
-                currentStatement = '';
+                currentStatement = "";
                 continue;
             }
             currentStatement += char;
         }
         // Add any remaining statement
         const trimmed = currentStatement.trim();
-        if (trimmed && !trimmed.startsWith('--') && trimmed !== '') {
+        if (trimmed && !trimmed.startsWith("--") && trimmed !== "") {
             statements.push(trimmed);
         }
         return statements;
@@ -451,11 +451,11 @@ class BackupRestoreTools {
      */
     async getDatabaseSchema(params) {
         try {
-            const { database, include_views = true, include_procedures = true, include_functions = true, include_triggers = true } = params;
+            const { database, include_views = true, include_procedures = true, include_functions = true, include_triggers = true, } = params;
             // Validate database access
             const dbValidation = this.validateDatabaseAccess(database);
             if (!dbValidation.valid) {
-                return { status: 'error', error: dbValidation.error };
+                return { status: "error", error: dbValidation.error };
             }
             const schema = {
                 database: dbValidation.database,
@@ -463,7 +463,7 @@ class BackupRestoreTools {
                 views: [],
                 procedures: [],
                 functions: [],
-                triggers: []
+                triggers: [],
             };
             let queryCount = 0;
             // Get tables
@@ -478,7 +478,7 @@ class BackupRestoreTools {
                 if (createResult.length > 0) {
                     schema.tables.push({
                         name: tableName,
-                        create_statement: createResult[0]['Create Table']
+                        create_statement: createResult[0]["Create Table"],
                     });
                 }
             }
@@ -495,7 +495,7 @@ class BackupRestoreTools {
                     if (createResult.length > 0) {
                         schema.views.push({
                             name: viewName,
-                            create_statement: createResult[0]['Create View']
+                            create_statement: createResult[0]["Create View"],
                         });
                     }
                 }
@@ -503,7 +503,9 @@ class BackupRestoreTools {
             // Get procedures
             if (include_procedures) {
                 const procsQuery = `SHOW PROCEDURE STATUS WHERE Db = ?`;
-                const procsResult = await this.db.query(procsQuery, [dbValidation.database]);
+                const procsResult = await this.db.query(procsQuery, [
+                    dbValidation.database,
+                ]);
                 queryCount++;
                 for (const proc of procsResult) {
                     try {
@@ -513,7 +515,7 @@ class BackupRestoreTools {
                         if (createResult.length > 0) {
                             schema.procedures.push({
                                 name: proc.Name,
-                                create_statement: createResult[0]['Create Procedure']
+                                create_statement: createResult[0]["Create Procedure"],
                             });
                         }
                     }
@@ -525,7 +527,9 @@ class BackupRestoreTools {
             // Get functions
             if (include_functions) {
                 const funcsQuery = `SHOW FUNCTION STATUS WHERE Db = ?`;
-                const funcsResult = await this.db.query(funcsQuery, [dbValidation.database]);
+                const funcsResult = await this.db.query(funcsQuery, [
+                    dbValidation.database,
+                ]);
                 queryCount++;
                 for (const func of funcsResult) {
                     try {
@@ -535,7 +539,7 @@ class BackupRestoreTools {
                         if (createResult.length > 0) {
                             schema.functions.push({
                                 name: func.Name,
-                                create_statement: createResult[0]['Create Function']
+                                create_statement: createResult[0]["Create Function"],
                             });
                         }
                     }
@@ -557,7 +561,7 @@ class BackupRestoreTools {
                         if (createResult.length > 0) {
                             schema.triggers.push({
                                 name: trigger.Trigger,
-                                create_statement: createResult[0]['SQL Original Statement']
+                                create_statement: createResult[0]["SQL Original Statement"],
                             });
                         }
                     }
@@ -567,16 +571,14 @@ class BackupRestoreTools {
                 }
             }
             return {
-                status: 'success',
+                status: "success",
                 data: schema,
-                queryLog: this.db.getFormattedQueryLogs(queryCount)
             };
         }
         catch (error) {
             return {
-                status: 'error',
+                status: "error",
                 error: error.message,
-                queryLog: this.db.getFormattedQueryLogs(1)
             };
         }
     }