@bytebase/dbhub 1.1.0 → 1.2.0

package/dist/public/index.html

@@ -5,7 +5,7 @@
     <link rel="icon" type="image/svg+xml" href="/favicon.svg" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>DBHub - Minimal Database MCP Server</title>
-    <script type="module" crossorigin src="/assets/index-DBYlgGks.js"></script>
+    <script type="module" crossorigin src="/assets/index-DOZ5HOZ9.js"></script>
     <link rel="stylesheet" crossorigin href="/assets/index-BJ-1UrcV.css">
   </head>
   <body>

package/dist/{registry-JYRRNC3E.js → registry-XMEJF7WW.js}

@@ -2,9 +2,9 @@ import {
   ToolRegistry,
   getToolRegistry,
   initializeToolRegistry
-} from "./chunk-GSSLHJB6.js";
+} from "./chunk-CUBIR72I.js";
 import "./chunk-WVVMH6FJ.js";
-import "./chunk-JEZZN2YZ.js";
+import "./chunk-WIQ4DWGY.js";
 export {
   ToolRegistry,
   getToolRegistry,

package/dist/{sqlite-5M7SDAQZ.js → sqlite-CZE6Z36Y.js}

@@ -4,13 +4,13 @@ import {
 import {
   SQLRowLimiter,
   closeQuietly
-} from "./chunk-S2V6RZ3C.js";
+} from "./chunk-RSB7DPO2.js";
 import {
   ConnectorRegistry,
   SafeURL,
   obfuscateDSNPassword,
   splitSQLStatements
-} from "./chunk-JEZZN2YZ.js";
+} from "./chunk-WIQ4DWGY.js";
 
 // src/connectors/sqlite/suppress-experimental-warning.ts
 var installed = false;
@@ -340,10 +340,10 @@ var SQLiteConnector = class _SQLiteConnector {
         if (isReadStatement) {
           if (parameters && parameters.length > 0) {
             const rows = this.prepare(processedStatement).all(...parameters);
-            return { rows, rowCount: rows.length };
+            return { resultSets: [{ sql: statements[0], rows, rowCount: rows.length }] };
           } else {
             const rows = this.prepare(processedStatement).all();
-            return { rows, rowCount: rows.length };
+            return { resultSets: [{ sql: statements[0], rows, rowCount: rows.length }] };
           }
         } else {
           let result;
@@ -352,7 +352,9 @@ var SQLiteConnector = class _SQLiteConnector {
           } else {
             result = this.prepare(processedStatement).run();
           }
-          return { rows: [], rowCount: Number(result.changes) };
+          return {
+            resultSets: [{ sql: statements[0], rows: [], rowCount: Number(result.changes) }]
+          };
         }
       } else {
         if (parameters && parameters.length > 0) {
@@ -368,24 +370,23 @@ var SQLiteConnector = class _SQLiteConnector {
             writeStatements.push(statement);
           }
         }
-        let totalChanges = 0;
+        const resultSets = [];
         for (const statement of writeStatements) {
           if (options.readonly) {
             this.db.exec("PRAGMA query_only = ON");
           }
           const result = this.prepare(statement).run();
-          totalChanges += Number(result.changes);
+          resultSets.push({ sql: statement, rows: [], rowCount: Number(result.changes) });
         }
-        let allRows = [];
-        for (let statement of readStatements) {
+        for (const statement of readStatements) {
           if (options.readonly) {
             this.db.exec("PRAGMA query_only = ON");
           }
-          statement = SQLRowLimiter.applyMaxRows(statement, options.maxRows);
-          const result = this.prepare(statement).all();
-          allRows.push(...result);
+          const processedStatement = SQLRowLimiter.applyMaxRows(statement, options.maxRows);
+          const rows = this.prepare(processedStatement).all();
+          resultSets.push({ sql: statement, rows, rowCount: rows.length });
         }
-        return { rows: allRows, rowCount: totalChanges + allRows.length };
+        return { resultSets };
       }
     } finally {
       if (options.readonly) {

package/dist/{sqlserver-PSAZRH7G.js → sqlserver-IIGRXGYK.js}

@@ -3,7 +3,7 @@ import {
   sqlServerDynamicSqlPattern,
   sqlServerPassThroughKeywords,
   sqlServerPassThroughPattern
-} from "./chunk-EPOKWSFC.js";
+} from "./chunk-PBN2UXB5.js";
 import {
   isDriverNotInstalled
 } from "./chunk-WVVMH6FJ.js";
@@ -14,13 +14,14 @@ import {
 import {
   SQLRowLimiter,
   closeQuietly
-} from "./chunk-S2V6RZ3C.js";
+} from "./chunk-RSB7DPO2.js";
 import {
   ConnectorRegistry,
   SafeURL,
   obfuscateDSNPassword,
+  splitSQLStatements,
   stripCommentsAndStrings
-} from "./chunk-JEZZN2YZ.js";
+} from "./chunk-WIQ4DWGY.js";
 
 // src/connectors/sqlserver/index.ts
 import sql from "mssql";
@@ -564,8 +565,9 @@ var _SQLServerConnector = class _SQLServerConnector {
       if (options.maxRows) {
         processedSQL = SQLRowLimiter.applyMaxRowsForSQLServer(sqlQuery, options.maxRows);
       }
+      const isSingleStatement = splitSQLStatements(processedSQL, "sqlserver").length === 1;
       if (options.readonly) {
-        return await this.executeReadOnly(processedSQL, parameters);
+        return await this.executeReadOnly(processedSQL, parameters, isSingleStatement);
       }
       const request = this.connection.request();
       const messages = [];
@@ -584,14 +586,57 @@ var _SQLServerConnector = class _SQLServerConnector {
       _SQLServerConnector.bindParameters(request, parameters);
       const result = await request.query(processedSQL);
       return {
-        rows: result.recordset || [],
-        rowCount: result.rowsAffected[0] || 0,
+        resultSets: _SQLServerConnector.buildResultSets(
+          result.recordsets,
+          result.rowsAffected,
+          isSingleStatement ? processedSQL : void 0
+        ),
         ...messages.length > 0 ? { messages } : {}
       };
     } catch (error) {
       throw new Error(`Failed to execute query: ${error.message}`);
     }
   }
+  /**
+   * Builds one result set per SELECT-producing statement in the batch, plus
+   * (if any) a trailing result set summarizing the write-only statements.
+   *
+   * node-mssql only pushes a `recordsets` entry for statements that produce
+   * columns (SELECT); INSERT/UPDATE/DELETE statements in the same batch
+   * contribute to `rowsAffected` only, with no way to recover which
+   * `rowsAffected` entry belongs to which statement from the driver's final
+   * arrays (`recordsets`/`rowsAffected` aren't index-aligned - see the
+   * tedious `doneHandler`, which always pushes to `rowsAffected` but only
+   * conditionally to `recordsets`). So a batch of pure writes collapses to a
+   * single summed result set, and a batch mixing writes with selects gets
+   * one result set per select plus one trailing "writes" set for the rest -
+   * not a truly per-statement breakdown, but no read statement's rows are
+   * ever merged with another's, which is what mattered for #380.
+   *
+   * `sourceSql`, when given, is attributed to the single resulting set - it
+   * must be omitted (pass `undefined`) unless the caller has already
+   * confirmed the batch is unambiguously one statement, since for a genuine
+   * multi-statement batch there's no reliable way to say which source
+   * statement a given recordset (or the trailing writes set) came from.
+   */
+  static buildResultSets(recordsets, rowsAffected, sourceSql) {
+    const sets = (recordsets ?? []).map((recordset) => {
+      const rows = recordset ?? [];
+      return { rows, rowCount: rows.length };
+    });
+    const totalAffected = (rowsAffected ?? []).reduce((total, count) => total + (count ?? 0), 0);
+    const accountedFor = sets.reduce((total, set) => total + set.rowCount, 0);
+    const writesOnly = totalAffected - accountedFor;
+    if (sets.length === 0) {
+      sets.push({ rows: [], rowCount: totalAffected });
+    } else if (writesOnly > 0) {
+      sets.push({ rows: [], rowCount: writesOnly });
+    }
+    if (sets.length === 1 && sourceSql !== void 0) {
+      sets[0].sql = sourceSql;
+    }
+    return sets;
+  }
   /**
    * Bind positional parameters as @p1, @p2, ... inferring the SQL Server type
    * from each JavaScript value. Shared by every execution path so they cannot
@@ -673,7 +718,7 @@ var _SQLServerConnector = class _SQLServerConnector {
    * Dangerous constructs are rejected before the transaction opens; see
    * assertNoReadOnlyEscapes.
    */
-  async executeReadOnly(processedSQL, parameters) {
+  async executeReadOnly(processedSQL, parameters, isSingleStatement) {
     this.assertNoReadOnlyEscapes(processedSQL, { transactionControl: true });
     const transaction = new sql.Transaction(this.connection);
     await transaction.begin();
@@ -710,8 +755,11 @@ var _SQLServerConnector = class _SQLServerConnector {
       }
     }
     return {
-      rows: result.recordset || [],
-      rowCount: result.rowsAffected[0] || 0,
+      resultSets: _SQLServerConnector.buildResultSets(
+        result.recordsets,
+        result.rowsAffected,
+        isSingleStatement ? processedSQL : void 0
+      ),
       ...messages.length > 0 ? { messages } : {}
     };
   }
@@ -756,8 +804,12 @@ var _SQLServerConnector = class _SQLServerConnector {
       const planRow = planResult.recordset?.[0];
       const planXml = planRow ? Object.values(planRow)[0] : null;
       return {
-        rows: planXml != null ? [{ plan: planXml }] : [],
-        rowCount: planXml != null ? 1 : 0
+        resultSets: [
+          {
+            rows: planXml != null ? [{ plan: planXml }] : [],
+            rowCount: planXml != null ? 1 : 0
+          }
+        ]
       };
     } catch (error) {
       throw new Error(`Failed to explain query: ${error.message}`);
@@ -878,8 +930,12 @@ var _SQLServerConnector = class _SQLServerConnector {
       }
       const planXml = _SQLServerConnector.extractPlanXml(planResult);
       return {
-        rows: planXml != null ? [{ plan: planXml }] : [],
-        rowCount: planXml != null ? 1 : 0
+        resultSets: [
+          {
+            rows: planXml != null ? [{ plan: planXml }] : [],
+            rowCount: planXml != null ? 1 : 0
+          }
+        ]
       };
     } catch (error) {
       throw new Error(`Failed to explain analyze query: ${error.message}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bytebase/dbhub",
-  "version": "1.1.0",
+  "version": "1.2.0",
   "mcpName": "io.github.bytebase/dbhub",
   "description": "Minimal, token-efficient Database MCP Server for PostgreSQL, MySQL, SQL Server, SQLite, MariaDB",
   "repository": {
@@ -33,7 +33,9 @@
     "test:unit": "vitest run --project unit",
     "test:watch": "vitest",
     "test:integration": "vitest run --project integration",
-    "test:build": "node scripts/smoke-test-build.mjs"
+    "test:build": "node scripts/smoke-test-build.mjs",
+    "sync-version": "node scripts/sync-version.mjs",
+    "version": "pnpm run sync-version && git add plugin/.claude-plugin/plugin.json plugin/.mcp.json server.json"
   },
   "engines": {
     "node": ">=22.5.0"