mcp-dbutils 0.15.2__tar.gz → 0.15.4__tar.gz

{mcp_dbutils-0.15.2 → mcp_dbutils-0.15.4}/.github/workflows/quality-assurance.yml

@@ -283,9 +283,18 @@ jobs:
             const projectKey = process.env.SONAR_PROJECT_KEY;
             console.log(`获取项目 ${projectKey} 的SonarCloud问题...`);
             
+            // 获取PR号
+            let prNumberParam = '';
+            if (context.issue.number) {
+              prNumberParam = `&pullRequest=${context.issue.number}`;
+              console.log(`处理PR #${context.issue.number}的SonarCloud问题`);
+            } else {
+              console.log('未检测到PR号，将获取所有未解决的问题');
+            }
+            
             // 获取未解决的问题
             const issuesResponse = await fetch(
-              `https://sonarcloud.io/api/issues/search?componentKeys=${projectKey}&resolved=false&ps=500`,
+              `https://sonarcloud.io/api/issues/search?componentKeys=${projectKey}${prNumberParam}&resolved=false&ps=500`,
               { headers: { Authorization: `Bearer ${process.env.SONAR_TOKEN}` } }
             ).then(res => res.json());
             

{mcp_dbutils-0.15.2 → mcp_dbutils-0.15.4}/CHANGELOG.md

@@ -1,3 +1,17 @@
+## [0.15.4](https://github.com/donghao1393/mcp-dbutils/compare/v0.15.3...v0.15.4) (2025-03-15)
+
+
+### Bug Fixes
+
+* 修复并启用test_list_tables_tool_errors测试 ([#47](https://github.com/donghao1393/mcp-dbutils/issues/47)) ([2dd707e](https://github.com/donghao1393/mcp-dbutils/commit/2dd707ecbca0e7cdf02721a5a3caf243537874fe)), closes [#46](https://github.com/donghao1393/mcp-dbutils/issues/46)
+
+## [0.15.3](https://github.com/donghao1393/mcp-dbutils/compare/v0.15.2...v0.15.3) (2025-03-15)
+
+
+### Bug Fixes
+
+* 修复SonarCloud问题提取逻辑，仅获取PR相关问题 ([#43](https://github.com/donghao1393/mcp-dbutils/issues/43)) ([8ca874c](https://github.com/donghao1393/mcp-dbutils/commit/8ca874c61a0f1d02ed98c79ea18ab7f66eb41659)), closes [#42](https://github.com/donghao1393/mcp-dbutils/issues/42)
+
 ## [0.15.2](https://github.com/donghao1393/mcp-dbutils/compare/v0.15.1...v0.15.2) (2025-03-14)
 
 

{mcp_dbutils-0.15.2 → mcp_dbutils-0.15.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mcp-dbutils
-Version: 0.15.2
+Version: 0.15.4
 Summary: MCP Database Utilities Service
 Author: Dong Hao
 License-Expression: MIT

{mcp_dbutils-0.15.2 → mcp_dbutils-0.15.4}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "mcp-dbutils"
-version = "0.15.2"
+version = "0.15.4"
 description = "MCP Database Utilities Service"
 readme = "README.md"
 license = "MIT"
@@ -62,7 +62,7 @@ filterwarnings = [
 # Ruff配置
 [tool.ruff]
 # 目标Python版本
-target-version = "0.15.2"
+target-version = "0.15.4"
 # 行长度限制
 line-length = 88
 # 排除的文件和目录

{mcp_dbutils-0.15.2 → mcp_dbutils-0.15.4}/src/mcp_dbutils/base.py

@@ -1,24 +1,11 @@
 """Connection server base class"""
 
-class ConnectionHandlerError(Exception):
-    """Base exception for connection errors"""
-    pass
-
-class ConfigurationError(ConnectionHandlerError):
-    """Configuration related errors"""
-    pass
-
-class ConnectionError(ConnectionHandlerError):
-    """Connection related errors"""
-    pass
-
 import json
 from abc import ABC, abstractmethod
 from contextlib import asynccontextmanager
 from datetime import datetime
 from importlib.metadata import metadata
-from typing import AsyncContextManager
-from unittest.mock import MagicMock
+from typing import Any, AsyncContextManager, Dict
 
 import mcp.server.stdio
 import mcp.types as types
@@ -28,6 +15,19 @@ from mcp.server import Server
 from .log import create_logger
 from .stats import ResourceStats
 
+
+class ConnectionHandlerError(Exception):
+    """Base exception for connection errors"""
+    pass
+
+class ConfigurationError(ConnectionHandlerError):
+    """Configuration related errors"""
+    pass
+
+class ConnectionError(ConnectionHandlerError):
+    """Connection related errors"""
+    pass
+
 # 常量定义
 DATABASE_CONNECTION_NAME = "Database connection name"
 EMPTY_QUERY_ERROR = "SQL query cannot be empty"
@@ -347,14 +347,16 @@ class ConnectionServer:
 
                 handler.stats.record_connection_start()
                 self.send_log(LOG_LEVEL_DEBUG, f"Handler created successfully for {connection}")
-                # 处理MagicMock对象，避免JSON序列化错误
+                # 使用通用的方式处理统计信息序列化
                 try:
-                    stats_dict = handler.stats.to_dict()
-                    stats_json = json.dumps(stats_dict)
-                    self.send_log(LOG_LEVEL_INFO, f"Resource stats: {stats_json}")
+                    if hasattr(handler.stats, 'to_dict') and callable(handler.stats.to_dict):
+                        stats_dict = handler.stats.to_dict()
+                        stats_json = json.dumps(stats_dict)
+                        self.send_log(LOG_LEVEL_INFO, f"Resource stats: {stats_json}")
+                    else:
+                        self.send_log(LOG_LEVEL_INFO, "Resource stats not available")
                 except TypeError:
-                    # 在测试环境中，stats可能是MagicMock对象
-                    self.send_log(LOG_LEVEL_INFO, "Resource stats: [Mock object in test environment]")
+                    self.send_log(LOG_LEVEL_INFO, "Resource stats: [Could not serialize stats object]")
                 yield handler
             except yaml.YAMLError as e:
                 raise ConfigurationError(f"Invalid YAML configuration: {str(e)}")
@@ -364,16 +366,19 @@ class ConnectionServer:
                 if handler:
                     self.send_log(LOG_LEVEL_DEBUG, f"Cleaning up handler for {connection}")
                     handler.stats.record_connection_end()
-                    # 处理MagicMock对象，避免JSON序列化错误
+                    # 使用通用的方式处理统计信息序列化
                     try:
-                        stats_dict = handler.stats.to_dict()
-                        stats_json = json.dumps(stats_dict)
-                        self.send_log(LOG_LEVEL_INFO, f"Final resource stats: {stats_json}")
+                        if hasattr(handler.stats, 'to_dict') and callable(handler.stats.to_dict):
+                            stats_dict = handler.stats.to_dict()
+                            stats_json = json.dumps(stats_dict)
+                            self.send_log(LOG_LEVEL_INFO, f"Final resource stats: {stats_json}")
+                        else:
+                            self.send_log(LOG_LEVEL_INFO, "Final resource stats not available")
                     except TypeError:
-                        # 在测试环境中，stats可能是MagicMock对象
-                        self.send_log(LOG_LEVEL_INFO, "Final resource stats: [Mock object in test environment]")
-                    # 在测试环境中，handler可能是MagicMock对象，但cleanup可能是AsyncMock
-                    await handler.cleanup()
+                        self.send_log(LOG_LEVEL_INFO, "Final resource stats: [Could not serialize stats object]")
+                    # 清理资源
+                    if hasattr(handler, 'cleanup') and callable(handler.cleanup):
+                        await handler.cleanup()
 
     def _setup_handlers(self):
         """Setup MCP handlers"""

{mcp_dbutils-0.15.2 → mcp_dbutils-0.15.4}/src/mcp_dbutils/sqlite/server.py

@@ -163,7 +163,7 @@ class SQLiteServer(ConnectionServer):
                 columns = [desc[0] for desc in cursor.description]
                 formatted_results = [dict(zip(columns, row)) for row in results]
 
-                # 在测试环境中，connection可能是MagicMock对象，不能序列化为JSON
+                # 使用更通用的方法确定配置名称
                 config_name = connection if isinstance(connection, str) else 'default'
                 result_text = json.dumps({
                     'type': 'sqlite',
@@ -179,7 +179,7 @@ class SQLiteServer(ConnectionServer):
                 return [types.TextContent(type="text", text=result_text)]
 
         except sqlite3.Error as e:
-            # 在测试环境中，connection可能是MagicMock对象，不能序列化为JSON
+            # 使用更通用的方法确定配置名称
             config_name = connection if isinstance(connection, str) else 'default'
             error_msg = json.dumps({
                 'type': 'sqlite',

{mcp_dbutils-0.15.2 → mcp_dbutils-0.15.4}/tests/integration/test_tools.py

@@ -266,9 +266,62 @@ async def test_list_indexes_tool(postgres_db, sqlite_db, mcp_config):
             await server_to_client_send.aclose()
             await server_to_client_recv.aclose()
 
-@pytest.mark.skip(reason="Error testing is unstable, will be fixed in a future PR")
 @pytest.mark.asyncio
 async def test_list_tables_tool_errors(postgres_db, mcp_config):
     """Test error cases for list_tables tool"""
-    # This test is skipped for now
-    pass
+    with tempfile.NamedTemporaryFile(mode='w', suffix='.yaml') as tmp:
+        # 写入有效的配置
+        yaml.dump(mcp_config, tmp)
+        tmp.flush()
+        server = ConnectionServer(config_path=tmp.name)
+
+        # 创建双向流
+        client_to_server_send, client_to_server_recv = anyio.create_memory_object_stream[types.JSONRPCMessage | Exception](10)
+        server_to_client_send, server_to_client_recv = anyio.create_memory_object_stream[types.JSONRPCMessage](10)
+
+        # 在后台启动服务器
+        server_task = asyncio.create_task(
+            server.server.run(
+                client_to_server_recv,
+                server_to_client_send,
+                server.server.create_initialization_options(),
+                raise_exceptions=False  # 不抛出异常，让客户端接收错误响应
+            )
+        )
+
+        try:
+            # 初始化客户端会话
+            client = ClientSession(server_to_client_recv, client_to_server_send)
+            async with client:
+                await client.initialize()
+
+                # 测试场景1：不存在的连接名
+                result = await client.call_tool("dbutils-list-tables", {"connection": "non_existent_connection"})
+                print(f"收到响应: {result}")
+                assert result.isError, "应该返回错误状态"
+                assert len(result.content) == 1
+                assert result.content[0].type == "text"
+                assert "Connection not found" in result.content[0].text
+                assert "non_existent_connection" in result.content[0].text
+
+                # 测试场景2：缺少必需的连接参数
+                result = await client.call_tool("dbutils-list-tables", {})
+                print(f"收到响应: {result}")
+                assert result.isError, "应该返回错误状态"
+                assert len(result.content) == 1
+                assert result.content[0].type == "text"
+                assert "Connection name must be specified" in result.content[0].text
+
+        finally:
+            # 清理
+            server_task.cancel()
+            try:
+                await server_task
+            except asyncio.CancelledError:
+                pass
+
+            # 关闭流
+            await client_to_server_send.aclose()
+            await client_to_server_recv.aclose()
+            await server_to_client_send.aclose()
+            await server_to_client_recv.aclose()