mcp-dbutils 0.4.0__py3-none-any.whl → 0.6.0__py3-none-any.whl

mcp_dbutils/base.py

@@ -220,29 +220,55 @@ class DatabaseServer:
                         },
                         "required": ["database", "sql"]
                     }
+                ),
+                types.Tool(
+                    name="list_tables",
+                    description="List all available tables in the specified database",
+                    inputSchema={
+                        "type": "object",
+                        "properties": {
+                            "database": {
+                                "type": "string",
+                                "description": "Database configuration name"
+                            }
+                        },
+                        "required": ["database"]
+                    }
                 )
             ]
 
         @self.server.call_tool()
         async def handle_call_tool(name: str, arguments: dict) -> list[types.TextContent]:
-            if name != "query":
-                raise ConfigurationError(f"Unknown tool: {name}")
-
             if "database" not in arguments:
                 raise ConfigurationError("Database configuration name must be specified")
 
-            sql = arguments.get("sql", "").strip()
-            if not sql:
-                raise ConfigurationError("SQL query cannot be empty")
-
-            # Only allow SELECT statements
-            if not sql.lower().startswith("select"):
-                raise ConfigurationError("Only SELECT queries are supported for security reasons")
-
             database = arguments["database"]
-            async with self.get_handler(database) as handler:
-                result = await handler.execute_query(sql)
-                return [types.TextContent(type="text", text=result)]
+
+            if name == "list_tables":
+                async with self.get_handler(database) as handler:
+                    tables = await handler.get_tables()
+                    formatted_tables = "\n".join([
+                        f"Table: {table.name}\n" +
+                        f"URI: {table.uri}\n" +
+                        (f"Description: {table.description}\n" if table.description else "") +
+                        "---"
+                        for table in tables
+                    ])
+                    return [types.TextContent(type="text", text=formatted_tables)]
+            elif name == "query":
+                sql = arguments.get("sql", "").strip()
+                if not sql:
+                    raise ConfigurationError("SQL query cannot be empty")
+
+                # Only allow SELECT statements
+                if not sql.lower().startswith("select"):
+                    raise ConfigurationError("Only SELECT queries are supported for security reasons")
+
+                async with self.get_handler(database) as handler:
+                    result = await handler.execute_query(sql)
+                    return [types.TextContent(type="text", text=result)]
+            else:
+                raise ConfigurationError(f"Unknown tool: {name}")
 
     async def run(self):
         """Run server"""

mcp_dbutils/sqlite/config.py

@@ -3,8 +3,50 @@
 from dataclasses import dataclass
 from pathlib import Path
 from typing import Dict, Any, Optional, Literal
+from urllib.parse import urlparse, parse_qs
 from ..config import DatabaseConfig
 
+def parse_jdbc_url(jdbc_url: str) -> Dict[str, str]:
+    """Parse JDBC URL into connection parameters
+
+    Args:
+        jdbc_url: JDBC URL (e.g. jdbc:sqlite:file:/path/to/database.db or jdbc:sqlite:/path/to/database.db)
+
+    Returns:
+        Dictionary of connection parameters
+
+    Raises:
+        ValueError: If URL format is invalid
+    """
+    if not jdbc_url.startswith('jdbc:sqlite:'):
+        raise ValueError("Invalid SQLite JDBC URL format")
+
+    # Remove jdbc:sqlite: prefix
+    url = jdbc_url[12:]
+
+    # Handle file: prefix
+    if url.startswith('file:'):
+        url = url[5:]
+
+    # Parse URL
+    parsed = urlparse(url)
+    path = parsed.path
+
+    # Extract query parameters
+    params = {}
+    if parsed.query:
+        query_params = parse_qs(parsed.query)
+        for key, values in query_params.items():
+            params[key] = values[0]
+
+    if not path:
+        raise ValueError("Database path must be specified in URL")
+
+    return {
+        'path': path,
+        'parameters': params
+    }
+
 @dataclass
 class SqliteConfig(DatabaseConfig):
     path: str
@@ -12,6 +54,30 @@ class SqliteConfig(DatabaseConfig):
     uri: bool = True  # Enable URI mode to support parameters like password
     type: Literal['sqlite'] = 'sqlite'
 
+    @classmethod
+    def from_jdbc_url(cls, jdbc_url: str, password: Optional[str] = None) -> 'SqliteConfig':
+        """Create configuration from JDBC URL
+
+        Args:
+            jdbc_url: JDBC URL (e.g. jdbc:sqlite:file:/path/to/database.db)
+            password: Optional password for database encryption
+
+        Returns:
+            SqliteConfig instance
+
+        Raises:
+            ValueError: If URL format is invalid
+        """
+        params = parse_jdbc_url(jdbc_url)
+
+        config = cls(
+            path=params['path'],
+            password=password,
+            uri=True
+        )
+        config.debug = cls.get_debug_mode()
+        return config
+
     @property
     def absolute_path(self) -> str:
         """Return absolute path to database file"""
@@ -62,13 +128,23 @@ class SqliteConfig(DatabaseConfig):
             raise ValueError("Database configuration must include 'type' field")
         if db_config['type'] != 'sqlite':
             raise ValueError(f"Configuration is not SQLite type: {db_config['type']}")
-        if 'path' not in db_config:
-            raise ValueError("SQLite configuration must include 'path' field")
 
-        config = cls(
-            path=db_config['path'],
-            password=db_config.get('password'),
-            uri=True
-        )
+        # Check if using JDBC URL configuration
+        if 'jdbc_url' in db_config:
+            params = parse_jdbc_url(db_config['jdbc_url'])
+            config = cls(
+                path=params['path'],
+                password=db_config.get('password'),
+                uri=True
+            )
+        else:
+            if 'path' not in db_config:
+                raise ValueError("SQLite configuration must include 'path' field")
+            config = cls(
+                path=db_config['path'],
+                password=db_config.get('password'),
+                uri=True
+            )
+
         config.debug = cls.get_debug_mode()
         return config

{mcp_dbutils-0.4.0.dist-info → mcp_dbutils-0.6.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mcp-dbutils
-Version: 0.4.0
+Version: 0.6.0
 Summary: MCP Database Utilities Service
 Author: Dong Hao
 License-Expression: MIT
@@ -148,7 +148,7 @@ The project requires a YAML configuration file, specified via the `--config` par
 
 ```yaml
 databases:
-  # PostgreSQL example (when using Docker)
+  # Standard PostgreSQL configuration example
   my_postgres:
     type: postgres
     dbname: test_db
@@ -158,13 +158,39 @@ databases:
     # host: 172.17.0.1         # For Linux (docker0 IP)
     port: 5432
 
-  # SQLite example (when using Docker)
+  # PostgreSQL with JDBC URL example
+  my_postgres_jdbc:
+    type: postgres
+    jdbc_url: jdbc:postgresql://host.docker.internal:5432/test_db
+    user: postgres            # Credentials must be provided separately
+    password: secret          # Not included in JDBC URL for security
+
+  # SQLite standard configuration
   my_sqlite:
     type: sqlite
-    path: /app/sqlite.db       # Mapped path inside container
+    path: /app/sqlite.db       # Database file path
     password: optional_password # optional
+
+  # SQLite with JDBC URL configuration
+  my_sqlite_jdbc:
+    type: sqlite
+    jdbc_url: jdbc:sqlite:/app/data.db?mode=ro&cache=shared  # Supports query parameters
+    password: optional_password    # Provided separately for security
 ```
 
+The configuration supports JDBC URL format for both PostgreSQL and SQLite:
+
+PostgreSQL:
+1. Standard configuration with individual parameters
+2. JDBC URL configuration with separate credentials
+
+SQLite:
+1. Standard configuration with path parameter
+2. JDBC URL configuration with query parameters support:
+   - mode=ro: Read-only mode
+   - cache=shared: Shared cache mode
+   - Other SQLite URI parameters
+
 ### Debug Mode
 Set environment variable `MCP_DEBUG=1` to enable debug mode for detailed logging output.
 

{mcp_dbutils-0.4.0.dist-info → mcp_dbutils-0.6.0.dist-info}/RECORD

@@ -1,5 +1,5 @@
 mcp_dbutils/__init__.py,sha256=xcfE1spAaONAoxBYB1ZyDX8tw7nxV1PMqo_RwxLDp0A,1892
-mcp_dbutils/base.py,sha256=xdeLOKv9-dbMUzlIbD-BbRVbqAf1a3RjO25aw61vAzY,9691
+mcp_dbutils/base.py,sha256=kKeTKW2BqiSu32VHElfDVBE1ziR9EvFw71AVbYf9Xq0,10919
 mcp_dbutils/config.py,sha256=EwnPNuQVCBKd5WOXQfROyDTM-YpM_Odp0GhCPRg8YwE,1863
 mcp_dbutils/log.py,sha256=fibVIwsb1HVU5zriGrDZTMEirKjgIuxuN_B_YTdAJ7I,996
 mcp_dbutils/stats.py,sha256=2hiKi_M8V4xhVHlH5FS-Df5GuMEpuzif12C8ik06Khs,2538
@@ -8,11 +8,11 @@ mcp_dbutils/postgres/config.py,sha256=Np0GS5iUaUuWpYI8QfnyjUDy7v-vResQEAexR4W92-
 mcp_dbutils/postgres/handler.py,sha256=JC_Qyw1s6qjVR0tdH7FLAEAs9EPl_-wgFQLryQyMq5c,6089
 mcp_dbutils/postgres/server.py,sha256=_S3HF1KooxPB9gX1FedoOOGn93tHlIevCab6vjCt2TU,8715
 mcp_dbutils/sqlite/__init__.py,sha256=QV4th2ywzUmCCa3GHCcBf8blJ_E8OYy0dJ2fSf1TfSU,134
-mcp_dbutils/sqlite/config.py,sha256=QK1JlY-ZBB5VyhydbiU-aAKNESTWMtyBfawbv2DAVCQ,2452
+mcp_dbutils/sqlite/config.py,sha256=RTHT2Xx--g-osD73CpT8DrCk0VHpHfPil3D6YUzXD-g,4519
 mcp_dbutils/sqlite/handler.py,sha256=bf_k93rCcJn09zc7tsqrlbiTGUg3FspimfWKxK_JQTs,4970
 mcp_dbutils/sqlite/server.py,sha256=7Bbq9l7Ca_4dzkAbbdRcXxvHoO_NFLzZHwlhKB0HIJc,7724
-mcp_dbutils-0.4.0.dist-info/METADATA,sha256=1c8QEdqJmgHUCjsMxJEMh1C5Qdpq0EdXWAO07yIv77k,9478
-mcp_dbutils-0.4.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-mcp_dbutils-0.4.0.dist-info/entry_points.txt,sha256=XTjt0QmYRgKOJQT6skR9bp1EMUfIrgpHeZJPZ3CJffs,49
-mcp_dbutils-0.4.0.dist-info/licenses/LICENSE,sha256=1A_CwpWVlbjrKdVEYO77vYfnXlW7oxcilZ8FpA_BzCI,1065
-mcp_dbutils-0.4.0.dist-info/RECORD,,
+mcp_dbutils-0.6.0.dist-info/METADATA,sha256=Dkyfy_4VUB4VO5tl6zKAljcvacBp-irM7xTxVzUjOIo,10390
+mcp_dbutils-0.6.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+mcp_dbutils-0.6.0.dist-info/entry_points.txt,sha256=XTjt0QmYRgKOJQT6skR9bp1EMUfIrgpHeZJPZ3CJffs,49
+mcp_dbutils-0.6.0.dist-info/licenses/LICENSE,sha256=1A_CwpWVlbjrKdVEYO77vYfnXlW7oxcilZ8FpA_BzCI,1065
+mcp_dbutils-0.6.0.dist-info/RECORD,,