@bytebase/dbhub 1.1.0 → 1.2.0

package/README.md

@@ -1,5 +1,5 @@
 > [!NOTE]  
-> Brought to you by [Bytebase](https://www.bytebase.com/), open-source database DevSecOps platform.
+> Brought to you by [Bytebase](https://www.bytebase.com/), open-source database governance platform.
 
 <p align="center">
 <a href="https://dbhub.ai/" target="_blank">
@@ -30,7 +30,7 @@
                  MCP Clients           MCP Server             Databases
 ```
 
-DBHub is a zero-dependency, token efficient MCP server implementing the Model Context Protocol (MCP) server interface. This lightweight gateway allows MCP-compatible clients to connect to and explore different databases:
+DBHub is a token efficient, zero-dependency MCP server implementing the Model Context Protocol (MCP) server interface. This lightweight gateway allows MCP-compatible clients to connect to and explore different databases:
 
 - **Local Development First**: Zero dependency, token efficient with a minimal set of MCP tools to maximize context window
 - **Multi-Database**: PostgreSQL, MySQL, MariaDB, SQL Server, and SQLite through a single interface
@@ -49,7 +49,7 @@ DBHub implements MCP tools for database operations:
 - **[execute_sql](https://dbhub.ai/tools/execute-sql)**: Execute SQL queries with transaction support and safety controls
 - **[search_objects](https://dbhub.ai/tools/search-objects)**: Search and explore database schemas, tables, columns, indexes, and procedures with progressive disclosure
 - **[explain_sql](https://dbhub.ai/tools/explain-sql)** (opt-in): Show a query's execution plan without running it
-- **[health_check](https://dbhub.ai/tools/health-check)** (opt-in, PostgreSQL/MySQL/MariaDB/SQL Server for now): Report connection pool state and buffer cache hit ratio
+- **[health_check](https://dbhub.ai/tools/health-check)** (opt-in): Report connection pool state and buffer cache hit ratio
 - **[Custom Tools](https://dbhub.ai/tools/custom-tools)**: Define reusable, parameterized SQL operations in your `dbhub.toml` configuration file
 
 ## Workbench

package/dist/{chunk-GSSLHJB6.js → chunk-CUBIR72I.js}

@@ -8,7 +8,7 @@ import {
   getDefaultPortForType,
   parseConnectionInfoFromDSN,
   stripCommentsAndStrings
-} from "./chunk-JEZZN2YZ.js";
+} from "./chunk-WIQ4DWGY.js";
 
 // src/tools/builtin-tools.ts
 var BUILTIN_TOOL_EXECUTE_SQL = "execute_sql";
@@ -805,6 +805,21 @@ function resolveAllowedHosts() {
 function splitHostList(value) {
   return value.split(",").map((h) => h.trim()).filter((h) => h.length > 0);
 }
+function resolveAuthTokens() {
+  const args = parseCommandLineArgs();
+  const cliValue = requireFlagValue("auth-token", args, "secret1,secret2");
+  if (cliValue !== void 0) {
+    return { tokens: splitTokenList(cliValue), source: "command line argument" };
+  }
+  const envValue = process.env.DBHUB_AUTH_TOKEN?.trim();
+  if (envValue) {
+    return { tokens: splitTokenList(envValue), source: "environment variable" };
+  }
+  return { tokens: [], source: "default" };
+}
+function splitTokenList(value) {
+  return value.split(",").map((t) => t.trim()).filter((t) => t.length > 0);
+}
 function redactDSN(dsn) {
   try {
     const url = new URL(dsn);
@@ -2492,6 +2507,7 @@ export {
   resolvePort,
   resolveHost,
   resolveAllowedHosts,
+  resolveAuthTokens,
   resolveSourceConfigs,
   BUILTIN_TOOL_EXECUTE_SQL,
   BUILTIN_TOOL_SEARCH_OBJECTS,

package/dist/{chunk-EPOKWSFC.js → chunk-PBN2UXB5.js}

@@ -1,6 +1,6 @@
 import {
   stripCommentsAndStrings
-} from "./chunk-JEZZN2YZ.js";
+} from "./chunk-WIQ4DWGY.js";
 
 // src/utils/allowed-keywords.ts
 var allowedKeywords = {

package/dist/{chunk-NIILHXTG.js → chunk-QEFMUQJ2.js}

@@ -4,7 +4,7 @@ import {
 } from "./chunk-FU2ZJE4E.js";
 import {
   obfuscateDSNPassword
-} from "./chunk-JEZZN2YZ.js";
+} from "./chunk-WIQ4DWGY.js";
 
 // src/connectors/mysql-family-health-check.ts
 async function getMySQLFamilyHealthCheck(query) {
@@ -111,49 +111,36 @@ function isMultiStatementResult(results) {
   const firstElement = results[0];
   return isMetadataObject(firstElement) || Array.isArray(firstElement);
 }
-function extractRowsFromMultiStatement(results) {
-  if (!Array.isArray(results)) {
-    return [];
-  }
-  const allRows = [];
-  for (const result of results) {
+function buildResultSetsFromMultiStatement(results, statementTexts) {
+  const sql = statementTexts?.length === results.length ? statementTexts : void 0;
+  return results.map((result, index) => {
     if (Array.isArray(result)) {
-      allRows.push(...result);
+      return { sql: sql?.[index], rows: result, rowCount: result.length };
     }
-  }
-  return allRows;
+    if (isMetadataObject(result)) {
+      return { sql: sql?.[index], rows: [], rowCount: result.affectedRows || 0 };
+    }
+    return { sql: sql?.[index], rows: [], rowCount: 0 };
+  });
 }
-function extractAffectedRows(results) {
+function parseQueryResultSets(results, statementTexts) {
+  const singleStatementSql = statementTexts?.length === 1 ? statementTexts[0] : void 0;
   if (isMetadataObject(results)) {
-    return results.affectedRows || 0;
+    return [{ sql: singleStatementSql, rows: [], rowCount: results.affectedRows || 0 }];
   }
   if (!Array.isArray(results)) {
-    return 0;
+    return [{ sql: singleStatementSql, rows: [], rowCount: 0 }];
   }
   if (isMultiStatementResult(results)) {
-    let totalAffected = 0;
-    for (const result of results) {
-      if (isMetadataObject(result)) {
-        totalAffected += result.affectedRows || 0;
-      } else if (Array.isArray(result)) {
-        totalAffected += result.length;
-      }
-    }
-    return totalAffected;
+    return buildResultSetsFromMultiStatement(results, statementTexts);
   }
-  return results.length;
-}
-function parseQueryResults(results) {
-  if (!Array.isArray(results)) {
-    return [];
-  }
-  if (isMultiStatementResult(results)) {
-    return extractRowsFromMultiStatement(results);
-  }
-  return results;
+  return [{ sql: singleStatementSql, rows: results, rowCount: results.length }];
 }
 
 // src/utils/readonly-transaction.ts
+function isClientSideTimeout(error) {
+  return typeof error === "object" && error !== null && error.code === "PROTOCOL_SEQUENCE_TIMEOUT";
+}
 async function withReadOnlyTransaction(conn, readonly, supportsReadOnlyTransaction, execute) {
   if (!readonly) {
     return execute();
@@ -166,9 +153,11 @@ async function withReadOnlyTransaction(conn, readonly, supportsReadOnlyTransacti
     await conn.query(supportsReadOnlyTransaction ? "COMMIT" : "ROLLBACK");
     return result;
   } catch (error) {
-    try {
-      await conn.query("ROLLBACK");
-    } catch {
+    if (!isClientSideTimeout(error)) {
+      try {
+        await conn.query("ROLLBACK");
+      } catch {
+      }
     }
     throw error;
   }
@@ -183,8 +172,8 @@ export {
   getMySQLFamilyHealthCheck,
   MissingDatabaseError,
   requireDatabaseInDSN,
-  extractAffectedRows,
-  parseQueryResults,
+  parseQueryResultSets,
+  isClientSideTimeout,
   withReadOnlyTransaction,
   isTiDBVersion
 };

package/dist/{chunk-S2V6RZ3C.js → chunk-RSB7DPO2.js}

@@ -1,6 +1,7 @@
 import {
+  blankCommentsAndStrings,
   stripCommentsAndStrings
-} from "./chunk-JEZZN2YZ.js";
+} from "./chunk-WIQ4DWGY.js";
 
 // src/utils/sql-row-limiter.ts
 var SQLRowLimiter = class {
@@ -70,17 +71,77 @@ var SQLRowLimiter = class {
 LIMIT ${maxRows}${hasSemicolon ? ";" : ""}`;
     }
   }
+  /**
+   * Scan blanked (comment/string-free, length-preserving) SQL for parenthesis
+   * depth, invoking onMatch for every regex hit at depth 0 (i.e. not nested
+   * inside a subquery, function call, or window OVER clause).
+   */
+  static scanTopLevel(blankedSQL, regex, onMatch) {
+    let depth = 0;
+    let m;
+    while ((m = regex.exec(blankedSQL)) !== null) {
+      const token = m[0];
+      if (token === "(") {
+        depth++;
+      } else if (token === ")") {
+        depth--;
+      } else if (depth === 0) {
+        onMatch(m);
+      }
+    }
+  }
+  /**
+   * Check if a SQL statement combines multiple SELECTs with a set operator
+   * (UNION [ALL], INTERSECT, EXCEPT) at the top level — i.e. not nested
+   * inside a subquery already wrapped in parentheses. Strips comments and
+   * string literals first to avoid false positives.
+   */
+  static hasSetOperator(sql) {
+    const blankedSQL = blankCommentsAndStrings(sql, "sqlserver");
+    let found = false;
+    this.scanTopLevel(blankedSQL, /\(|\)|\bunion\b|\bintersect\b|\bexcept\b/gi, () => {
+      found = true;
+    });
+    return found;
+  }
+  /**
+   * Find the start index of a top-level trailing ORDER BY clause (not one
+   * nested inside a subquery or a window function's OVER (...) clause).
+   * Returns -1 if none exists. Operates on the original (non-blanked) SQL
+   * length, since blankCommentsAndStrings preserves length/position.
+   */
+  static findTopLevelOrderByIndex(sql) {
+    const blankedSQL = blankCommentsAndStrings(sql, "sqlserver");
+    let lastIndex = -1;
+    this.scanTopLevel(blankedSQL, /\(|\)|\border\s+by\b/gi, (m) => {
+      lastIndex = m.index;
+    });
+    return lastIndex;
+  }
   /**
    * Add or modify TOP clause in a SQL statement (SQL Server)
    */
   static applyTopToQuery(sql, maxRows) {
+    if (this.hasSetOperator(sql)) {
+      const trimmed = sql.trim();
+      const hasSemicolon = trimmed.endsWith(";");
+      const sqlWithoutSemicolon = hasSemicolon ? trimmed.slice(0, -1) : trimmed;
+      const orderByIndex = this.findTopLevelOrderByIndex(sqlWithoutSemicolon);
+      if (orderByIndex !== -1) {
+        const innerSql = sqlWithoutSemicolon.slice(0, orderByIndex).trimEnd();
+        const orderByClause = sqlWithoutSemicolon.slice(orderByIndex).trim();
+        return `SELECT TOP ${maxRows} * FROM (${innerSql}
+) AS subq ${orderByClause}${hasSemicolon ? ";" : ""}`;
+      }
+      return `SELECT TOP ${maxRows} * FROM (${sqlWithoutSemicolon}
+) AS subq${hasSemicolon ? ";" : ""}`;
+    }
     const existingTop = this.extractTopValue(sql);
     if (existingTop !== null) {
       const effectiveTop = Math.min(existingTop, maxRows);
       return sql.replace(/\bselect\s+top\s+\d+/i, `SELECT TOP ${effectiveTop}`);
-    } else {
-      return sql.replace(/\bselect\s+/i, `SELECT TOP ${maxRows} `);
     }
+    return sql.replace(/\bselect\s+/i, `SELECT TOP ${maxRows} `);
   }
   /**
    * Check if a LIMIT clause uses a parameter placeholder (not a literal number).

package/dist/{chunk-JEZZN2YZ.js → chunk-WIQ4DWGY.js}

@@ -462,6 +462,21 @@ function stripCommentsAndStrings(sql, dialect) {
   }
   return parts.join("");
 }
+function blankCommentsAndStrings(sql, dialect) {
+  const scanToken = getScanner(dialect);
+  let result = "";
+  let i = 0;
+  while (i < sql.length) {
+    const token = scanToken(sql, i);
+    if (token.type === TokenType.Plain) {
+      result += sql[i];
+    } else {
+      result += " ".repeat(token.end - i);
+    }
+    i = token.end;
+  }
+  return result;
+}
 function splitSQLStatements(sql, dialect) {
   const scanToken = getScanner(dialect);
   const statements = [];
@@ -495,5 +510,6 @@ export {
   getDatabaseTypeFromDSN,
   getDefaultPortForType,
   stripCommentsAndStrings,
+  blankCommentsAndStrings,
   splitSQLStatements
 };

package/dist/index.js

@@ -12,19 +12,20 @@ import {
   loadTomlConfig,
   mapArgumentsToArray,
   resolveAllowedHosts,
+  resolveAuthTokens,
   resolveHost,
   resolvePort,
   resolveSourceConfigs,
   resolveTomlConfigPath,
   resolveTransport
-} from "./chunk-GSSLHJB6.js";
+} from "./chunk-CUBIR72I.js";
 import {
   allowedKeywords,
   getFirstKeyword,
   hasEscapeHatchFunction,
   isReadOnlySQL,
   sqlServerDynamicSqlPattern
-} from "./chunk-EPOKWSFC.js";
+} from "./chunk-PBN2UXB5.js";
 import {
   loadConnectors
 } from "./chunk-WVVMH6FJ.js";
@@ -38,7 +39,7 @@ import {
   parseConnectionInfoFromDSN,
   splitSQLStatements,
   stripCommentsAndStrings
-} from "./chunk-JEZZN2YZ.js";
+} from "./chunk-WIQ4DWGY.js";
 
 // src/server.ts
 import { McpServer, createMcpHandler } from "@modelcontextprotocol/server";
@@ -219,6 +220,13 @@ function normalizeSourceId(id) {
 function getEffectiveSourceId(sourceId) {
   return sourceId || "default";
 }
+function toStatementsPayload(resultSets) {
+  return resultSets.map((set) => ({
+    sql: set.sql,
+    rows: set.rows,
+    count: set.rowCount
+  }));
+}
 function resolveTrackedToolName(sourceId, baseName) {
   const isSingleSource = ConnectorManager.getAvailableSourceIds().length === 1;
   if (isSingleSource) {
@@ -288,8 +296,7 @@ function createExecuteSqlToolHandler(sourceId) {
       };
       result = await connector.executeSQL(sql, executeOptions);
       const responseData = {
-        rows: result.rows,
-        count: result.rowCount,
+        statements: toStatementsPayload(result.resultSets),
         source_id: effectiveSourceId,
         ...result.messages && result.messages.length > 0 ? { messages: result.messages } : {}
       };
@@ -348,8 +355,9 @@ async function getTableRowCount(connector, tableName, schemaName) {
     const qualifiedTable = quoteQualifiedIdentifier(tableName, schemaName, connector.id);
     const countQuery = `SELECT COUNT(*) as count FROM ${qualifiedTable}`;
     const result = await connector.executeSQL(countQuery, { maxRows: 1, readonly: true });
-    if (result.rows && result.rows.length > 0) {
-      return Number(result.rows[0].count || result.rows[0].COUNT || 0);
+    const rows = result.resultSets[0]?.rows;
+    if (rows && rows.length > 0) {
+      return Number(rows[0].count || rows[0].COUNT || 0);
     }
   } catch (error) {
     return null;
@@ -852,8 +860,8 @@ function createExplainSqlToolHandler(sourceId) {
       const explainStatement = buildExplainStatement(connector.id, sql);
       result = await connector.executeSQL(explainStatement, { readonly: true });
       const responseData = {
-        rows: result.rows,
-        count: result.rowCount,
+        rows: result.resultSets[0].rows,
+        count: result.resultSets[0].rowCount,
         source_id: effectiveSourceId,
         ...result.messages && result.messages.length > 0 ? { messages: result.messages } : {}
       };
@@ -1036,7 +1044,7 @@ function getExplainSqlMetadata(sourceId) {
     "explain_sql",
     "Explain Query Plan"
   );
-  const description = isSingleSource ? `${userDescPrefix}Show the execution plan for a SQL statement on the ${dbType} database without running it. Always read-only and safe, independent of the source's read/write mode.` : `${userDescPrefix}Show the execution plan for a SQL statement on the '${sourceId}' ${dbType} database without running it. Always read-only and safe, independent of the source's read/write mode.`;
+  const description = isSingleSource ? `${userDescPrefix}Show the execution plan for a SQL statement on the ${dbType} database without running it (always read-only).` : `${userDescPrefix}Show the execution plan for a SQL statement on the '${sourceId}' ${dbType} database without running it (always read-only).`;
   const annotations = {
     title,
     readOnlyHint: true,
@@ -1057,7 +1065,7 @@ function getHealthCheckMetadata(sourceId) {
     "health_check",
     "Health Check"
   );
-  const description = isSingleSource ? `${userDescPrefix}Report operational health metrics (connection pool state, buffer cache hit ratio) for the ${dbType} database. Read-only, independent of the source's read/write mode.` : `${userDescPrefix}Report operational health metrics (connection pool state, buffer cache hit ratio) for the '${sourceId}' ${dbType} database. Read-only, independent of the source's read/write mode.`;
+  const description = isSingleSource ? `${userDescPrefix}Report connection pool and buffer cache health metrics for the ${dbType} database (read-only).` : `${userDescPrefix}Report connection pool and buffer cache health metrics for the '${sourceId}' ${dbType} database (read-only).`;
   const annotations = {
     title,
     readOnlyHint: true,
@@ -1107,13 +1115,13 @@ function buildSearchObjectsTool(sourceId) {
         name: "object_type",
         type: "string",
         required: true,
-        description: "Object type to search: schema, table, view, column, procedure, function, index"
+        description: "Object type to search"
       },
       {
         name: "pattern",
         type: "string",
         required: false,
-        description: "LIKE pattern (% = any chars, _ = one char). Default: %"
+        description: "LIKE pattern (% = any chars, _ = one char)"
       },
       {
         name: "schema",
@@ -1137,7 +1145,7 @@ function buildSearchObjectsTool(sourceId) {
         name: "limit",
         type: "integer",
         required: false,
-        description: "Max results (default: 100, max: 1000)"
+        description: "Max results"
       }
     ],
     readonly: true
@@ -1267,8 +1275,7 @@ function createCustomToolHandler(toolConfig) {
         paramValues
       );
       const responseData = {
-        rows: result.rows,
-        count: result.rowCount,
+        statements: toStatementsPayload(result.resultSets),
         source_id: toolConfig.source
       };
       return createToolSuccessResponse(responseData);
@@ -1822,6 +1829,32 @@ function validateOrigin(originHeader, hostHeader, allowedHosts) {
   return { ok: true };
 }
 
+// src/utils/auth-token.ts
+import { timingSafeEqual } from "node:crypto";
+var BEARER_PREFIX = "Bearer ";
+function constantTimeEqual(a, b) {
+  const bufA = Buffer.from(a);
+  const bufB = Buffer.from(b);
+  if (bufA.length !== bufB.length) return false;
+  return timingSafeEqual(bufA, bufB);
+}
+function validateAuthToken(authorizationHeader, tokens) {
+  if (tokens.length === 0) return { ok: true };
+  if (!authorizationHeader || !authorizationHeader.startsWith(BEARER_PREFIX)) {
+    return {
+      ok: false,
+      status: 401,
+      message: "Missing or malformed Authorization header. Expected: Bearer <token>"
+    };
+  }
+  const presented = authorizationHeader.slice(BEARER_PREFIX.length);
+  const matches = tokens.some((token) => constantTimeEqual(presented, token));
+  if (!matches) {
+    return { ok: false, status: 401, message: "Invalid bearer token" };
+  }
+  return { ok: true };
+}
+
 // src/server.ts
 var __filename = fileURLToPath(import.meta.url);
 var __dirname = path.dirname(__filename);
@@ -1876,7 +1909,7 @@ See documentation for more details on configuring database connections.
     const sources = sourceConfigsData.sources;
     console.error(`Configuration source: ${sourceConfigsData.source}`);
     await connectorManager.connectWithSources(sources);
-    const { initializeToolRegistry: initializeToolRegistry2 } = await import("./registry-JYRRNC3E.js");
+    const { initializeToolRegistry: initializeToolRegistry2 } = await import("./registry-XMEJF7WW.js");
     initializeToolRegistry2({
       sources: sourceConfigsData.sources,
       tools: sourceConfigsData.tools
@@ -1906,6 +1939,7 @@ See documentation for more details on configuring database connections.
     const port = transportData.type === "http" ? resolvePort().port : null;
     const host = transportData.type === "http" ? resolveHost().host : null;
     const allowedHosts = transportData.type === "http" ? buildAllowedHosts(resolveAllowedHosts().hosts, host ?? void 0, getSelfHosts()) : /* @__PURE__ */ new Set();
+    const { tokens: authTokens, source: authTokenSource } = resolveAuthTokens();
     const activeModes = [];
     const modeDescriptions = [];
     const isDemo = isDemoMode();
@@ -1940,18 +1974,26 @@ See documentation for more details on configuring database connections.
         }
         res.header("Access-Control-Allow-Origin", origin || "http://localhost");
         res.header("Access-Control-Allow-Methods", "GET, POST, OPTIONS");
-        res.header("Access-Control-Allow-Headers", "Content-Type, Mcp-Session-Id, MCP-Protocol-Version, Mcp-Method, Mcp-Name");
+        res.header("Access-Control-Allow-Headers", "Content-Type, Authorization, Mcp-Session-Id, MCP-Protocol-Version, Mcp-Method, Mcp-Name");
         res.header("Access-Control-Allow-Credentials", "true");
         if (req.method === "OPTIONS") {
           return res.sendStatus(200);
         }
         next();
       });
-      const frontendPath = path.join(__dirname, "public");
-      app.use(express.static(frontendPath));
       app.get("/healthz", (req, res) => {
         res.status(200).send("OK");
       });
+      app.use((req, res, next) => {
+        const result = validateAuthToken(req.headers.authorization, authTokens);
+        if (!result.ok) {
+          res.header("WWW-Authenticate", "Bearer");
+          return res.status(result.status).json({ error: "Unauthorized", message: result.message });
+        }
+        next();
+      });
+      const frontendPath = path.join(__dirname, "public");
+      app.use(express.static(frontendPath));
       app.get("/api/sources", listSources);
       app.get("/api/sources/:sourceId", getSource);
       app.get("/api/requests", listRequests);
@@ -1983,6 +2025,11 @@ See documentation for more details on configuring database connections.
         } else {
           console.error(`Allowed hosts: ${[...allowedHosts].join(", ")} (set --allowed-hosts to serve other hostnames)`);
         }
+        if (authTokens.length > 0) {
+          console.error(`Auth: bearer token required (${authTokens.length} token(s) configured via ${authTokenSource})`);
+        } else {
+          console.error("Auth: disabled (set --auth-token or DBHUB_AUTH_TOKEN to require a bearer token)");
+        }
         if (process.env.NODE_ENV === "development") {
           console.error("Development mode detected!");
           console.error("   Workbench dev server (with HMR): http://localhost:5173");
@@ -2017,11 +2064,11 @@ See documentation for more details on configuring database connections.
 
 // src/index.ts
 var connectorModules = [
-  { load: () => import("./postgres-5ZOFYV6X.js"), name: "PostgreSQL", driver: "pg" },
-  { load: () => import("./sqlserver-PSAZRH7G.js"), name: "SQL Server", driver: "mssql" },
-  { load: () => import("./sqlite-5M7SDAQZ.js"), name: "SQLite", driver: "node:sqlite" },
-  { load: () => import("./mysql-265M3KBD.js"), name: "MySQL", driver: "mysql2" },
-  { load: () => import("./mariadb-DUDFBY5W.js"), name: "MariaDB", driver: "mariadb" }
+  { load: () => import("./postgres-6XY2GPQV.js"), name: "PostgreSQL", driver: "pg" },
+  { load: () => import("./sqlserver-IIGRXGYK.js"), name: "SQL Server", driver: "mssql" },
+  { load: () => import("./sqlite-CZE6Z36Y.js"), name: "SQLite", driver: "node:sqlite" },
+  { load: () => import("./mysql-RLDQI3SJ.js"), name: "MySQL", driver: "mysql2" },
+  { load: () => import("./mariadb-E33EXGJZ.js"), name: "MariaDB", driver: "mariadb" }
 ];
 loadConnectors(connectorModules).then(() => main()).catch((error) => {
   console.error("Fatal error:", error);

package/dist/{mariadb-DUDFBY5W.js → mariadb-E33EXGJZ.js}

@@ -1,12 +1,11 @@
 import {
   MissingDatabaseError,
-  extractAffectedRows,
   getMySQLFamilyHealthCheck,
   isTiDBVersion,
-  parseQueryResults,
+  parseQueryResultSets,
   requireDatabaseInDSN,
   withReadOnlyTransaction
-} from "./chunk-NIILHXTG.js";
+} from "./chunk-QEFMUQJ2.js";
 import "./chunk-FU2ZJE4E.js";
 import {
   quoteIdentifier
@@ -14,13 +13,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/mariadb/index.ts
 import * as mariadb from "mariadb";
@@ -505,9 +504,9 @@ var MariaDBConnector = class _MariaDBConnector {
         options.readonly,
         this.supportsReadOnlyTransaction,
         async () => {
+          const statements = splitSQLStatements(sql, "mariadb");
           let processedSQL = sql;
           if (options.maxRows) {
-            const statements = splitSQLStatements(sql, "mariadb");
             const processedStatements = statements.map(
               (statement) => SQLRowLimiter.applyMaxRows(statement, options.maxRows)
             );
@@ -522,9 +521,8 @@ var MariaDBConnector = class _MariaDBConnector {
           } else {
             results = await conn.query(processedSQL);
           }
-          const rows = parseQueryResults(results);
-          const rowCount = extractAffectedRows(results);
-          return { rows, rowCount };
+          const resultSets = parseQueryResultSets(results, statements);
+          return { resultSets };
         }
       );
     } finally {