feat: multi-statement #216

tianzhou · 2025-12-26T09:15:55Z

No description provided.

🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude Opus 4.5 <[email protected]>

- Backend: Replace SQLResult with StatementResult (includes sql field) - Backend: All connectors return StatementResult[] array - Backend: execute-sql tool returns statements array in response - Frontend: Each statement result becomes a separate tab - Frontend: Multi-statement tabs labeled as "12:34:05 (1/3)" - Frontend: Remove redundant executedSql (now in result.sql) 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude Opus 4.5 <[email protected]>

Remove statement index/total suffix from multi-statement tabs. 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude Opus 4.5 <[email protected]>

🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude Opus 4.5 <[email protected]>

- Add ChevronLeft/Right icons - Show arrow buttons when tabs overflow - Hide native scrollbar - Smooth scroll on arrow click 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude Opus 4.5 <[email protected]>

Copilot

Pull request overview

This PR implements multi-statement SQL execution support, allowing users to execute multiple SQL statements separated by semicolons in a single query. The backend changes the return type from a single SQLResult to an array of StatementResult[], with each statement's results tracked separately. The frontend introduces a tabbed interface to display results from multiple statements, with each tab showing the results of one statement.

Refactored all database connectors (Postgres, MySQL, MariaDB, SQLite, SQL Server) to return per-statement results
Added frontend tabbed interface for viewing multi-statement results with horizontal scrolling
Updated API layer to handle array of statement results instead of single result

Reviewed changes

Copilot reviewed 16 out of 16 changed files in this pull request and generated 14 comments.

Show a summary per file

File	Description
src/connectors/interface.ts	Renamed `SQLResult` to `StatementResult` and added `sql` field; changed `executeSQL` return type to array
src/connectors/sqlserver/index.ts	Implemented multi-statement support with statement splitting and per-statement result tracking
src/connectors/sqlite/index.ts	Implemented multi-statement support with individual statement execution and result collection
src/connectors/postgres/index.ts	Implemented multi-statement support with transaction wrapping for consistency
src/connectors/mysql/index.ts	Implemented multi-statement support using MySQL2's native multi-statement capability
src/connectors/mariadb/index.ts	Implemented multi-statement support with statement splitting and result parsing
src/tools/execute-sql.ts	Updated response builder to map statement results into the expected format
frontend/src/components/views/ToolDetailView.tsx	Refactored to handle multiple result tabs instead of single result, with tab management logic
frontend/src/components/tool/ResultsTable.tsx	Updated to receive `StatementResult` and display SQL from result object
frontend/src/components/tool/ResultsTabs.tsx	New component implementing tabbed interface with horizontal scrolling and tab close functionality
frontend/src/components/tool/types.ts	New type definitions for `ResultTab` interface
frontend/src/components/tool/index.ts	Added exports for new `ResultsTabs` component and `ResultTab` type
frontend/src/components/icons/XIcon.tsx	New close icon component for tab close buttons
frontend/src/components/icons/ChevronRightIcon.tsx	New right chevron icon for tab scroll button
frontend/src/components/icons/ChevronLeftIcon.tsx	New left chevron icon for tab scroll button
frontend/src/api/tools.ts	Updated to parse array of statement results and transform them into `StatementResult[]`

Copilot · 2025-12-26T09:20:26Z

src/connectors/mysql/index.ts

+      const statements = sql.split(';')
+        .map(statement => statement.trim())
+        .filter(statement => statement.length > 0);


Splitting SQL statements on semicolons can break valid SQL that contains semicolons within string literals, comments, or stored procedure bodies. For example, "SELECT 'hello;world'" would be incorrectly split into two statements. Consider using a proper SQL parser or implementing a state machine that respects SQL syntax rules for quoted strings and comments.

Copilot · 2025-12-26T09:20:26Z

src/connectors/sqlite/index.ts

+        for (let statement of statements) {
          const trimmedStatement = statement.toLowerCase().trim();
-          if (trimmedStatement.startsWith('select') ||
-              trimmedStatement.startsWith('with') ||
-              trimmedStatement.startsWith('explain') ||
-              trimmedStatement.startsWith('analyze') ||
-              (trimmedStatement.startsWith('pragma') &&
-               (trimmedStatement.includes('table_info') ||
-                trimmedStatement.includes('index_info') ||
-                trimmedStatement.includes('index_list') ||
-                trimmedStatement.includes('foreign_key_list')))) {
-            readStatements.push(statement);
+          const isReadStatement = trimmedStatement.startsWith('select') ||
+                                trimmedStatement.startsWith('with') ||
+                                trimmedStatement.startsWith('explain') ||
+                                trimmedStatement.startsWith('analyze') ||
+                                (trimmedStatement.startsWith('pragma') &&
+                                 (trimmedStatement.includes('table_info') ||
+                                  trimmedStatement.includes('index_info') ||
+                                  trimmedStatement.includes('index_list') ||
+                                  trimmedStatement.includes('foreign_key_list')));
+
+          if (isReadStatement) {
+            // Apply maxRows limit to SELECT queries if specified
+            const processedStatement = SQLRowLimiter.applyMaxRows(statement, options.maxRows);
+            const rows = this.db.prepare(processedStatement).all();
+            results.push({ sql: statement, rows, rowCount: rows.length });
          } else {
-            writeStatements.push(statement);
+            const result = this.db.prepare(statement).run();
+            results.push({ sql: statement, rows: [], rowCount: result.changes });
          }
        }


In the multi-statement path, if any statement fails during execution in the for loop, there's no error logging to help with debugging. Unlike the single-statement path which logs detailed error information when parameters are present, the multi-statement path provides no such debugging context about which specific statement failed. Consider adding error logging similar to the single-statement path.

frontend/src/components/tool/ResultsTabs.tsx

src/connectors/mariadb/index.ts

frontend/src/components/views/ToolDetailView.tsx

Copilot · 2025-12-26T09:20:29Z

src/connectors/mariadb/index.ts

+      const statements = sql.split(';')
+        .map(statement => statement.trim())
+        .filter(statement => statement.length > 0);


Splitting SQL statements on semicolons can break valid SQL that contains semicolons within string literals, comments, or stored procedure bodies. For example, "SELECT 'hello;world'" would be incorrectly split into two statements. Consider using a proper SQL parser or implementing a state machine that respects SQL syntax rules for quoted strings and comments.

Copilot · 2025-12-26T09:20:30Z

src/connectors/sqlserver/index.ts

+          const result = await this.connection.request().query(processedStatement);
+
+          // Add each statement result to the array
+          results.push({
+            sql: statement,
+            rows: result.recordset || [],
+            rowCount: result.rowsAffected[0] || 0,
+          });
+        }
+
+        return results;
+      }
    } catch (error) {


In the multi-statement path, if any statement fails during execution in the for loop, the error is caught by the outer catch block and wrapped in a generic error message. This loses important context about which specific statement failed. Unlike the single-statement path which logs detailed error information (SQL and parameters), the multi-statement path provides no such debugging information. Consider adding similar error logging for multi-statement queries.

Suggested change

const result = await this.connection.request().query(processedStatement);

// Add each statement result to the array

results.push({

sql: statement,

rows: result.recordset || [],

rowCount: result.rowsAffected[0] || 0,

});

}

return results;

}

} catch (error) {

try {

const result = await this.connection.request().query(processedStatement);

// Add each statement result to the array

results.push({

sql: statement,

rows: result.recordset || [],

rowCount: result.rowsAffected[0] || 0,

});

} catch (statementError) {

// Log detailed information about the failing statement before propagating the error

console.error("Error executing SQL Server statement in multi-statement query", {

statement,

processedStatement,

options,

error: statementError,

});

throw statementError;

}

}

return results;

}

} catch (error) {

// Log high-level context for any failure in executeSQL

console.error("Failed to execute SQL Server query", {

sqlQuery,

options,

parameters,

error,

});

Copilot · 2025-12-26T09:20:30Z

src/connectors/mysql/index.ts

+            for (let i = 0; i < statements.length; i++) {
+              const statementResult = firstResult[i];
+              const rows = parseQueryResults(statementResult);
+              const rowCount = extractAffectedRows(statementResult);
+              results.push({ sql: statements[i], rows, rowCount });
+            }


There's a potential mismatch between the number of statements and results. If the result array from MySQL contains fewer elements than the statements array (which could happen if some statements fail silently or are optimized away), this will push undefined results. Consider adding a guard to ensure i is within bounds of firstResult array.

frontend/src/components/tool/ResultsTable.tsx

Copilot · 2025-12-26T09:20:31Z

src/connectors/sqlserver/index.ts

+      const statements = sqlQuery.split(';')
+        .map(statement => statement.trim())
+        .filter(statement => statement.length > 0);


Splitting SQL statements on semicolons can break valid SQL that contains semicolons within string literals, comments, or stored procedure bodies. For example, "SELECT 'hello;world'" would be incorrectly split into two statements. Consider using a proper SQL parser or implementing a state machine that respects SQL syntax rules for quoted strings and comments.

Replace local isReadStatement logic with shared allowed-keywords utility. 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude Opus 4.5 <[email protected]>

🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude Opus 4.5 <[email protected]>

Resolved conflicts in frontend files keeping multi-statement SQL support with per-statement tabs and arrow navigation. 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude Opus 4.5 <[email protected]>

Co-authored-by: Copilot <[email protected]>

tianzhou and others added 9 commits December 26, 2025 00:00

feat(icons): add XIcon for close buttons

407cd7d

🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude Opus 4.5 <[email protected]>

feat(tool): add ResultTab type for tabbed results

37be65a

🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude Opus 4.5 <[email protected]>

feat(tool): add ResultsTabs component for tabbed query results

c944b3e

feat(tool): integrate tabbed results in ToolDetailView

0bcd2dc

fix(a11y): add aria-labels to tab close button and error indicator

2b59f76

🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude Opus 4.5 <[email protected]>

refactor: simplify tab labels to timestamp only

eec553d

Remove statement index/total suffix from multi-statement tabs. 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude Opus 4.5 <[email protected]>

fix: hide vertical scrollbar in tab bar

0d97c73

🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude Opus 4.5 <[email protected]>

feat: add arrow buttons for tab navigation

e6e77b4

- Add ChevronLeft/Right icons - Show arrow buttons when tabs overflow - Hide native scrollbar - Smooth scroll on arrow click 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude Opus 4.5 <[email protected]>

Copilot AI review requested due to automatic review settings December 26, 2025 09:15

Copilot started reviewing on behalf of tianzhou December 26, 2025 09:16 View session

Copilot AI reviewed Dec 26, 2025

View reviewed changes

tianzhou and others added 4 commits December 26, 2025 01:21

refactor(sqlite): use shared isReadOnlySQL utility

a9a24ff

Replace local isReadStatement logic with shared allowed-keywords utility. 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude Opus 4.5 <[email protected]>

refactor(sqlite): use isReadOnlySQL for single statement too

a234100

🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude Opus 4.5 <[email protected]>

Merge branch 'main' into multi-statement

ad2dcbb

Resolved conflicts in frontend files keeping multi-statement SQL support with per-statement tabs and arrow navigation. 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude Opus 4.5 <[email protected]>

Update frontend/src/components/views/ToolDetailView.tsx

c4d5dcc

Co-authored-by: Copilot <[email protected]>

tianzhou closed this Dec 26, 2025

tianzhou deleted the multi-statement branch December 26, 2025 15:22

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

feat: multi-statement #216

feat: multi-statement #216

Uh oh!

tianzhou commented Dec 26, 2025

Uh oh!

Copilot AI left a comment

Uh oh!

Copilot AI Dec 26, 2025

Uh oh!

Copilot AI Dec 26, 2025

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Copilot AI Dec 26, 2025

Uh oh!

Copilot AI Dec 26, 2025

Uh oh!

Copilot AI Dec 26, 2025

Uh oh!

Uh oh!

Copilot AI Dec 26, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

feat: multi-statement #216

feat: multi-statement #216

Uh oh!

Conversation

tianzhou commented Dec 26, 2025

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Copilot AI Dec 26, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Dec 26, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Copilot AI Dec 26, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Dec 26, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Dec 26, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Copilot AI Dec 26, 2025

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants