@bytebase/dbhub 0.22.2 → 0.22.3

package/dist/index.js

@@ -99,7 +99,9 @@ var allowedKeywords = {
   mysql: ["select", "with", "explain", "show", "describe", "desc"],
   mariadb: ["select", "with", "explain", "show", "describe", "desc"],
   sqlite: ["select", "with", "explain", "pragma"],
-  sqlserver: ["select", "with", "explain", "showplan"]
+  // SQL Server has no native EXPLAIN statement; the connector translates a
+  // leading `EXPLAIN` into a SET SHOWPLAN_XML request (see SQLServerConnector).
+  sqlserver: ["select", "with", "explain"]
 };
 var mutatingKeywords = [
   "insert",
@@ -321,6 +323,15 @@ function likePatternToRegex(pattern) {
   const escaped = pattern.replace(/[.*+?^${}()|[\]\\]/g, "\\$&").replace(/%/g, ".*").replace(/_/g, ".");
   return new RegExp(`^${escaped}$`, "i");
 }
+async function resolveDefaultSchemas(connector) {
+  if (connector.getDefaultSchema) {
+    const defaultSchema = await connector.getDefaultSchema();
+    if (defaultSchema) {
+      return [defaultSchema];
+    }
+  }
+  return connector.getSchemas();
+}
 async function getTableRowCount(connector, tableName, schemaName) {
   try {
     if (connector.getTableRowCount) {
@@ -348,7 +359,7 @@ async function getTableComment(connector, tableName, schemaName) {
   }
 }
 async function searchSchemas(connector, pattern, detailLevel, limit) {
-  const schemas = await connector.getSchemas();
+  const schemas = await resolveDefaultSchemas(connector);
   const regex = likePatternToRegex(pattern);
   const matched = schemas.filter((schema) => regex.test(schema)).slice(0, limit);
   if (detailLevel === "names") {
@@ -379,7 +390,7 @@ async function searchTables(connector, pattern, schemaFilter, detailLevel, limit
   if (schemaFilter) {
     schemasToSearch = [schemaFilter];
   } else {
-    schemasToSearch = await connector.getSchemas();
+    schemasToSearch = await resolveDefaultSchemas(connector);
   }
   for (const schemaName of schemasToSearch) {
     if (results.length >= limit) break;
@@ -532,7 +543,7 @@ async function searchColumns(connector, pattern, schemaFilter, tableFilter, deta
   if (schemaFilter) {
     schemasToSearch = [schemaFilter];
   } else {
-    schemasToSearch = await connector.getSchemas();
+    schemasToSearch = await resolveDefaultSchemas(connector);
   }
   for (const schemaName of schemasToSearch) {
     if (results.length >= limit) break;
@@ -589,7 +600,7 @@ async function searchProcedures(connector, pattern, schemaFilter, detailLevel, l
   if (schemaFilter) {
     schemasToSearch = [schemaFilter];
   } else {
-    schemasToSearch = await connector.getSchemas();
+    schemasToSearch = await resolveDefaultSchemas(connector);
   }
   for (const schemaName of schemasToSearch) {
     if (results.length >= limit) break;
@@ -637,7 +648,7 @@ async function searchIndexes(connector, pattern, schemaFilter, tableFilter, deta
   if (schemaFilter) {
     schemasToSearch = [schemaFilter];
   } else {
-    schemasToSearch = await connector.getSchemas();
+    schemasToSearch = await resolveDefaultSchemas(connector);
   }
   for (const schemaName of schemasToSearch) {
     if (results.length >= limit) break;
@@ -1695,10 +1706,10 @@ See documentation for more details on configuring database connections.
 // src/index.ts
 var connectorModules = [
   { load: () => import("./postgres-EKVOBAH6.js"), name: "PostgreSQL", driver: "pg" },
-  { load: () => import("./sqlserver-5E7DSDVX.js"), name: "SQL Server", driver: "mssql" },
+  { load: () => import("./sqlserver-5TFVBCMA.js"), name: "SQL Server", driver: "mssql" },
   { load: () => import("./sqlite-2GBIF3MQ.js"), name: "SQLite", driver: "node:sqlite" },
-  { load: () => import("./mysql-NCKXNVZJ.js"), name: "MySQL", driver: "mysql2" },
-  { load: () => import("./mariadb-DVQM4MMM.js"), name: "MariaDB", driver: "mariadb" }
+  { load: () => import("./mysql-WG6UFALX.js"), name: "MySQL", driver: "mysql2" },
+  { load: () => import("./mariadb-ERB4D3RP.js"), name: "MariaDB", driver: "mariadb" }
 ];
 loadConnectors(connectorModules).then(() => main()).catch((error) => {
   console.error("Fatal error:", error);

package/dist/{mariadb-DVQM4MMM.js → mariadb-ERB4D3RP.js}

@@ -123,8 +123,9 @@ var MariaDBConnector = class _MariaDBConnector {
     }
     try {
       const rows = await this.pool.query(`
-        SELECT SCHEMA_NAME 
+        SELECT SCHEMA_NAME
         FROM INFORMATION_SCHEMA.SCHEMATA
+        WHERE SCHEMA_NAME NOT IN ('information_schema', 'performance_schema', 'mysql', 'sys')
         ORDER BY SCHEMA_NAME
       `);
       return rows.map((row) => row.SCHEMA_NAME);
@@ -447,6 +448,18 @@ var MariaDBConnector = class _MariaDBConnector {
     const rows = await this.pool.query("SELECT DATABASE() AS DB");
     return rows[0].DB;
   }
+  /**
+   * Default search scope = the database named in the DSN. DATABASE() returns
+   * null when the connection was opened without a database, in which case
+   * callers fall back to the full server-wide schema list.
+   */
+  async getDefaultSchema() {
+    if (!this.pool) {
+      throw new Error("Not connected to database");
+    }
+    const rows = await this.pool.query("SELECT DATABASE() AS DB");
+    return rows[0]?.DB ?? null;
+  }
   async executeSQL(sql, options, parameters) {
     if (!this.pool) {
       throw new Error("Not connected to database");

package/dist/{mysql-NCKXNVZJ.js → mysql-WG6UFALX.js}

@@ -129,8 +129,9 @@ var MySQLConnector = class _MySQLConnector {
     }
     try {
       const [rows] = await this.pool.query(`
-        SELECT SCHEMA_NAME 
+        SELECT SCHEMA_NAME
         FROM INFORMATION_SCHEMA.SCHEMATA
+        WHERE SCHEMA_NAME NOT IN ('information_schema', 'performance_schema', 'mysql', 'sys')
         ORDER BY SCHEMA_NAME
       `);
       return rows.map((row) => row.SCHEMA_NAME);
@@ -453,6 +454,18 @@ var MySQLConnector = class _MySQLConnector {
     const [rows] = await this.pool.query("SELECT DATABASE() AS DB");
     return rows[0].DB;
   }
+  /**
+   * Default search scope = the database named in the DSN. DATABASE() returns
+   * null when the connection was opened without a database, in which case
+   * callers fall back to the full server-wide schema list.
+   */
+  async getDefaultSchema() {
+    if (!this.pool) {
+      throw new Error("Not connected to database");
+    }
+    const [rows] = await this.pool.query("SELECT DATABASE() AS DB");
+    return rows[0]?.DB ?? null;
+  }
   async executeSQL(sql, options, parameters) {
     if (!this.pool) {
       throw new Error("Not connected to database");

package/dist/{sqlserver-5E7DSDVX.js → sqlserver-5TFVBCMA.js}

@@ -7,7 +7,8 @@ import {
 import {
   ConnectorRegistry,
   SafeURL,
-  obfuscateDSNPassword
+  obfuscateDSNPassword,
+  stripCommentsAndStrings
 } from "./chunk-C7WEAPX4.js";
 
 // src/connectors/sqlserver/index.ts
@@ -135,7 +136,7 @@ Expected: ${expectedFormat}`
     }
   }
 };
-var SQLServerConnector = class _SQLServerConnector {
+var _SQLServerConnector = class _SQLServerConnector {
   constructor() {
     this.id = "sqlserver";
     this.name = "SQL Server";
@@ -457,6 +458,12 @@ var SQLServerConnector = class _SQLServerConnector {
     if (!this.connection) {
       throw new Error("Not connected to SQL Server database");
     }
+    const afterNoise = sqlQuery.slice(
+      sqlQuery.match(_SQLServerConnector.LEADING_NOISE)[0].length
+    );
+    if (/^explain\b/i.test(afterNoise)) {
+      return this.explainQuery(afterNoise.slice("explain".length).trim());
+    }
     try {
       let processedSQL = sqlQuery;
       if (options.maxRows) {
@@ -518,7 +525,60 @@ var SQLServerConnector = class _SQLServerConnector {
       throw new Error(`Failed to execute query: ${error.message}`);
     }
   }
+  /**
+   * Return the estimated execution plan for a query using SHOWPLAN_XML.
+   *
+   * SHOWPLAN_XML compiles the statement and returns its plan without executing
+   * it, but it has two constraints: `SET SHOWPLAN_XML ON` must be the only
+   * statement in its batch, and the setting is session scoped. The shared pool
+   * hands out a fresh connection per request() and an open transaction
+   * suppresses SHOWPLAN, so neither can carry the setting to a follow-up query.
+   *
+   * We therefore run the SET / query pair on a short-lived, single-connection
+   * pool built from the same config. The dedicated session keeps SHOWPLAN state
+   * off the shared pool, so a concurrent query can never land on a connection
+   * with SHOWPLAN enabled (which would return a plan instead of its results).
+   */
+  async explainQuery(innerQuery) {
+    const cleaned = stripCommentsAndStrings(innerQuery, "sqlserver").trim();
+    if (!cleaned) {
+      throw new Error("EXPLAIN requires a statement to analyze");
+    }
+    if (/\bset\s+showplan/i.test(cleaned)) {
+      throw new Error("EXPLAIN does not support SET SHOWPLAN statements");
+    }
+    if (!this.config) {
+      throw new Error("Not connected to SQL Server database");
+    }
+    const explainPool = new sql.ConnectionPool({
+      ...this.config,
+      pool: { ...this.config.pool, max: 1, min: 1 }
+    });
+    try {
+      await explainPool.connect();
+      await explainPool.request().batch("SET SHOWPLAN_XML ON");
+      const planResult = await explainPool.request().batch(innerQuery);
+      const planRow = planResult.recordset?.[0];
+      const planXml = planRow ? Object.values(planRow)[0] : null;
+      return {
+        rows: planXml != null ? [{ plan: planXml }] : [],
+        rowCount: planXml != null ? 1 : 0
+      };
+    } catch (error) {
+      throw new Error(`Failed to explain query: ${error.message}`);
+    } finally {
+      await explainPool.close();
+    }
+  }
 };
+/**
+ * Leading whitespace and SQL comments to skip before looking for a keyword.
+ * The read-only validator strips comments before checking the first keyword,
+ * so the connector must skip them too; otherwise an EXPLAIN preceded by a
+ * comment passes validation but reaches the server untranslated.
+ */
+_SQLServerConnector.LEADING_NOISE = /^(?:\s+|--[^\n]*(?:\n|$)|\/\*[\s\S]*?\*\/)*/;
+var SQLServerConnector = _SQLServerConnector;
 var sqlServerConnector = new SQLServerConnector();
 ConnectorRegistry.register(sqlServerConnector);
 export {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bytebase/dbhub",
-  "version": "0.22.2",
+  "version": "0.22.3",
   "mcpName": "io.github.bytebase/dbhub",
   "description": "Minimal, token-efficient Database MCP Server for PostgreSQL, MySQL, SQL Server, SQLite, MariaDB",
   "repository": {