MCP: Update table names

Author: amotl

framework/mcp/example_builtin.py

@@ -40,14 +40,12 @@ async def run():
 
             # Validate database content.
             db = DatabaseAdapter("crate://crate@localhost:4200/")
-            db.run_sql("CREATE TABLE IF NOT EXISTS public.testdrive (id INT, data TEXT)")
-            db.run_sql("INSERT INTO public.testdrive (id, data) VALUES (42, 'Hotzenplotz')")
-            db.refresh_table("public.testdrive")
+            db.run_sql("CREATE TABLE IF NOT EXISTS public.mcp_builtin (id INT, data TEXT)")
+            db.run_sql("INSERT INTO public.mcp_builtin (id, data) VALUES (42, 'Hotzenplotz')")
+            db.refresh_table("public.mcp_builtin")
 
             # Read a few resources.
-            # FIXME: Only works on schema=public, because the PostgreSQL adapter hard-codes `WHERE table_schema = 'public'`.
-            # https://github.com/bytebase/dbhub/blob/09424c8513c8c7bef7f66377b46a2b93a69a57d2/src/connectors/postgres/index.ts#L89-L107
-            await client.read_resource("postgres://crate@localhost:5432/testdrive/schema")
+            await client.read_resource("postgres://crate@localhost:5432/mcp_builtin/schema")
 
 
 if __name__ == "__main__":

framework/mcp/example_dbhub.py

@@ -43,9 +43,9 @@ async def run():
 
             # Validate database content.
             db = DatabaseAdapter("crate://crate@localhost:4200/")
-            db.run_sql("CREATE TABLE IF NOT EXISTS testdrive.dbhub (id INT, data TEXT)")
-            db.run_sql("INSERT INTO testdrive.dbhub (id, data) VALUES (42, 'Hotzenplotz')")
-            db.refresh_table("public.testdrive")
+            db.run_sql("CREATE TABLE IF NOT EXISTS testdrive.mcp_dbhub (id INT, data TEXT)")
+            db.run_sql("INSERT INTO testdrive.mcp_dbhub (id, data) VALUES (42, 'Hotzenplotz')")
+            db.refresh_table("testdrive.mcp_dbhub")
 
             # Read available resources.
             await client.read_resource("db://schemas")

framework/mcp/example_jdbc.py

@@ -42,8 +42,8 @@ async def run():
             # await client.call_tool("list_tables", arguments={})
             await client.call_tool("describe_table", arguments={"schema": "sys", "table": "summits"})
             await client.call_tool("read_query", arguments={"query": "SELECT * FROM sys.summits ORDER BY height DESC LIMIT 3"})
-            await client.call_tool("create_table", arguments={"query": "CREATE TABLE IF NOT EXISTS testdrive (id INT, data TEXT)"})
-            await client.call_tool("write_query", arguments={"query": "INSERT INTO testdrive (id, data) VALUES (42, 'foobar')"})
+            await client.call_tool("create_table", arguments={"query": "CREATE TABLE IF NOT EXISTS testdrive.mcp_jdbc (id INT, data TEXT)"})
+            await client.call_tool("write_query", arguments={"query": "INSERT INTO testdrive.mcp_jdbc (id, data) VALUES (42, 'foobar')"})
 
             # Get a few prompts.
             await client.get_prompt("er_diagram")

framework/mcp/test.py

@@ -46,7 +46,7 @@ def test_builtin():
     # Validate output specific to CrateDB.
     assert b"Calling tool: query" in p.stdout
     assert b"mountain: Mont Blanc" in p.stdout
-    assert b"Reading resource: postgres://crate@localhost:5432/testdrive/schema" in p.stdout
+    assert b"Reading resource: postgres://crate@localhost:5432/mcp_builtin/schema" in p.stdout
     assert b"column_name: id" in p.stdout
     assert b"data_type: integer" in p.stdout
 
@@ -77,8 +77,8 @@ def test_jdbc():
 
     # Validate database content.
     db = DatabaseAdapter("crate://crate@localhost:4200/")
-    db.refresh_table("doc.testdrive")
-    records = db.run_sql("SELECT * FROM doc.testdrive", records=True)
+    db.refresh_table("testdrive.mcp_jdbc")
+    records = db.run_sql("SELECT * FROM testdrive.mcp_jdbc", records=True)
     assert len(records) >= 1
     assert records[0] == {"id": 42, "data": "foobar"}
 
@@ -114,5 +114,5 @@ def test_dbhub():
     assert b"- testdrive" in p.stdout
 
     assert b"Getting prompt: explain_db" in p.stdout
-    assert b"Table: dbhub in schema 'testdrive'" in p.stdout
+    assert b"Table: mcp_dbhub in schema 'testdrive'" in p.stdout
     assert b"Structure:\\n- id (integer)\\n- data (text)" in p.stdout