@bytebase/dbhub 0.4.11 → 0.5.0

package/README.md

@@ -49,10 +49,10 @@ https://demo.dbhub.ai/sse connects a [sample employee database](https://github.c
 
 ### Database Tools
 
-| Tool            | Command Name      | PostgreSQL | MySQL | MariaDB | SQL Server | SQLite | Oracle |
-| --------------- | ----------------- | :--------: | :---: | :-----: | :--------: | ------ | :----: |
-| Execute SQL     | `execute_sql`     |     ✅     |  ✅   |   ✅    |     ✅     | ✅     |   ✅   |
-| List Connectors | `list_connectors` |     ✅     |  ✅   |   ✅    |     ✅     | ✅     |   ✅   |
+| Tool            | Command Name      | Description                                                         | PostgreSQL | MySQL | MariaDB | SQL Server | SQLite | Oracle |
+| --------------- | ----------------- | ------------------------------------------------------------------- | :--------: | :---: | :-----: | :--------: | ------ | :----: |
+| Execute SQL     | `execute_sql`     | Execute single or multiple SQL statements (separated by semicolons) |     ✅     |  ✅   |   ✅    |     ✅     | ✅     |   ✅   |
+| List Connectors | `list_connectors` | List all available database connectors                              |     ✅     |  ✅   |   ✅    |     ✅     | ✅     |   ✅   |
 
 ### Prompt Capabilities
 
@@ -99,7 +99,7 @@ docker run --rm --init \
 ```
 
 ```bash
-# Oracle example with thick mode for connecting to 11g or older 
+# Oracle example with thick mode for connecting to 11g or older
 docker run --rm --init \
    --name dbhub \
    --publish 8080:8080 \
@@ -179,14 +179,14 @@ npx @bytebase/dbhub --transport sse --port 8080 --demo
 
 You can specify the SSL mode using the `sslmode` parameter in your DSN string:
 
-| Database   | `sslmode=disable` | `sslmode=require` | Default SSL Behavior |
-|------------|:----------------:|:----------------:|:-------------------:|
-| PostgreSQL | ✅ | ✅ | Certificate verification |
-| MySQL      | ✅ | ✅ | Certificate verification |
-| MariaDB    | ✅ | ✅ | Certificate verification |
-| SQL Server | ✅ | ✅ | Certificate verification |
-| Oracle     | ✅ | ✅ | N/A (use Oracle client config) |
-| SQLite     | ❌ | ❌ | N/A (file-based)        |
+| Database   | `sslmode=disable` | `sslmode=require` |      Default SSL Behavior      |
+| ---------- | :---------------: | :---------------: | :----------------------------: |
+| PostgreSQL |        ✅         |        ✅         |    Certificate verification    |
+| MySQL      |        ✅         |        ✅         |    Certificate verification    |
+| MariaDB    |        ✅         |        ✅         |    Certificate verification    |
+| SQL Server |        ✅         |        ✅         |    Certificate verification    |
+| Oracle     |        ✅         |        ✅         | N/A (use Oracle client config) |
+| SQLite     |        ❌         |        ❌         |        N/A (file-based)        |
 
 **SSL Mode Options:**
 
@@ -196,6 +196,7 @@ You can specify the SSL mode using the `sslmode` parameter in your DSN string:
 Without specifying `sslmode`, most databases default to certificate verification, which provides the highest level of security.
 
 Example usage:
+
 ```bash
 # Disable SSL
 postgres://user:password@localhost:5432/dbname?sslmode=disable
@@ -255,14 +256,14 @@ For real databases, a Database Source Name (DSN) is required. You can provide th
 
 DBHub supports the following database connection string formats:
 
-| Database   | DSN Format                                                | Example                                                                                                     |
-| ---------- | --------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------- |
-| MySQL      | `mysql://[user]:[password]@[host]:[port]/[database]`      | `mysql://user:password@localhost:3306/dbname?sslmode=disable`                                                               |
-| MariaDB    | `mariadb://[user]:[password]@[host]:[port]/[database]`    | `mariadb://user:password@localhost:3306/dbname?sslmode=disable`                                                             |
-| PostgreSQL | `postgres://[user]:[password]@[host]:[port]/[database]`   | `postgres://user:password@localhost:5432/dbname?sslmode=disable`                                            |
-| SQL Server | `sqlserver://[user]:[password]@[host]:[port]/[database]`  | `sqlserver://user:password@localhost:1433/dbname?sslmode=disable`                                           |
-| SQLite     | `sqlite:///[path/to/file]` or `sqlite:///:memory:`           | `sqlite:///path/to/database.db`, `sqlite:C:/Users/YourName/data/database.db (windows)` or `sqlite:///:memory:` |
-| Oracle     | `oracle://[user]:[password]@[host]:[port]/[service_name]` | `oracle://username:password@localhost:1521/service_name?sslmode=disable`                                     |
+| Database   | DSN Format                                                | Example                                                                                                        |
+| ---------- | --------------------------------------------------------- | -------------------------------------------------------------------------------------------------------------- |
+| MySQL      | `mysql://[user]:[password]@[host]:[port]/[database]`      | `mysql://user:password@localhost:3306/dbname?sslmode=disable`                                                  |
+| MariaDB    | `mariadb://[user]:[password]@[host]:[port]/[database]`    | `mariadb://user:password@localhost:3306/dbname?sslmode=disable`                                                |
+| PostgreSQL | `postgres://[user]:[password]@[host]:[port]/[database]`   | `postgres://user:password@localhost:5432/dbname?sslmode=disable`                                               |
+| SQL Server | `sqlserver://[user]:[password]@[host]:[port]/[database]`  | `sqlserver://user:password@localhost:1433/dbname?sslmode=disable`                                              |
+| SQLite     | `sqlite:///[path/to/file]` or `sqlite:///:memory:`        | `sqlite:///path/to/database.db`, `sqlite:C:/Users/YourName/data/database.db (windows)` or `sqlite:///:memory:` |
+| Oracle     | `oracle://[user]:[password]@[host]:[port]/[service_name]` | `oracle://username:password@localhost:1521/service_name?sslmode=disable`                                       |
 
 #### Oracle
 
@@ -340,16 +341,17 @@ The demo mode uses an in-memory SQLite database loaded with the [sample employee
 
 ### Testing
 
-The project uses Vitest for testing:
+The project uses Vitest for comprehensive unit testing:
 
-- Run tests: `pnpm test`
-- Run tests in watch mode: `pnpm test:watch`
+- **Run all tests**: `pnpm test`
+- **Run tests in watch mode**: `pnpm test:watch`
 
 #### Pre-commit Hooks (for Developers)
 
 The project includes pre-commit hooks to run tests automatically before each commit:
 
 1. After cloning the repository, set up the pre-commit hooks:
+
    ```bash
    ./scripts/setup-husky.sh
    ```

package/dist/index.js

@@ -457,7 +457,26 @@ var PostgresConnector = class {
     }
     const client = await this.pool.connect();
     try {
-      return await client.query(sql2);
+      const statements = sql2.split(";").map((statement) => statement.trim()).filter((statement) => statement.length > 0);
+      if (statements.length === 1) {
+        return await client.query(statements[0]);
+      } else {
+        let allRows = [];
+        await client.query("BEGIN");
+        try {
+          for (const statement of statements) {
+            const result = await client.query(statement);
+            if (result.rows && result.rows.length > 0) {
+              allRows.push(...result.rows);
+            }
+          }
+          await client.query("COMMIT");
+        } catch (error) {
+          await client.query("ROLLBACK");
+          throw error;
+        }
+        return { rows: allRows };
+      }
     } finally {
       client.release();
     }
@@ -1004,8 +1023,31 @@ var SQLiteConnector = class {
       throw new Error("Not connected to SQLite database");
     }
     try {
-      const rows = this.db.prepare(sql2).all();
-      return { rows };
+      const statements = sql2.split(";").map((statement) => statement.trim()).filter((statement) => statement.length > 0);
+      if (statements.length === 1) {
+        const rows = this.db.prepare(statements[0]).all();
+        return { rows };
+      } else {
+        const readStatements = [];
+        const writeStatements = [];
+        for (const statement of statements) {
+          const trimmedStatement = statement.toLowerCase().trim();
+          if (trimmedStatement.startsWith("select") || trimmedStatement.startsWith("with") || trimmedStatement.startsWith("explain") || trimmedStatement.startsWith("analyze") || trimmedStatement.startsWith("pragma")) {
+            readStatements.push(statement);
+          } else {
+            writeStatements.push(statement);
+          }
+        }
+        if (writeStatements.length > 0) {
+          this.db.exec(writeStatements.join("; "));
+        }
+        let allRows = [];
+        for (const statement of readStatements) {
+          const result = this.db.prepare(statement).all();
+          allRows.push(...result);
+        }
+        return { rows: allRows };
+      }
     } catch (error) {
       throw error;
     }
@@ -1029,7 +1071,9 @@ var MySQLDSNParser = class {
         database: url.pathname ? url.pathname.substring(1) : "",
         // Remove leading '/' if exists
         user: url.username,
-        password: url.password
+        password: url.password,
+        multipleStatements: true
+        // Enable native multi-statement support
       };
       url.forEachSearchParam((value, key) => {
         if (key === "sslmode") {
@@ -1359,8 +1403,19 @@ var MySQLConnector = class {
       throw new Error("Not connected to database");
     }
     try {
-      const [rows, fields] = await this.pool.query(sql2);
-      return { rows, fields };
+      const results = await this.pool.query(sql2);
+      if (Array.isArray(results[0])) {
+        let allRows = [];
+        for (const result of results[0]) {
+          if (Array.isArray(result) && result.length > 0) {
+            allRows.push(...result);
+          }
+        }
+        return { rows: allRows };
+      } else {
+        const [rows, fields] = results;
+        return { rows, fields };
+      }
     } catch (error) {
       console.error("Error executing query:", error);
       throw error;
@@ -1385,7 +1440,9 @@ var MariadbDSNParser = class {
         database: url.pathname ? url.pathname.substring(1) : "",
         // Remove leading '/' if exists
         user: url.username,
-        password: url.password
+        password: url.password,
+        multipleStatements: true
+        // Enable native multi-statement support
       };
       url.forEachSearchParam((value, key) => {
         if (key === "sslmode") {
@@ -1716,8 +1773,23 @@ var MariaDBConnector = class {
       throw new Error("Not connected to database");
     }
     try {
-      const [rows, fields] = await this.pool.query(sql2);
-      return { rows, fields };
+      const results = await this.pool.query(sql2);
+      if (Array.isArray(results)) {
+        if (results.length > 1 || results[0] && Array.isArray(results[0])) {
+          let allRows = [];
+          for (const result of results) {
+            if (Array.isArray(result) && result.length > 0) {
+              allRows.push(...result);
+            }
+          }
+          return { rows: allRows };
+        } else {
+          const [rows, fields] = results;
+          return { rows, fields };
+        }
+      } else {
+        return { rows: results };
+      }
     } catch (error) {
       console.error("Error executing query:", error);
       throw error;
@@ -2836,18 +2908,25 @@ var allowedKeywords = {
 
 // src/tools/execute-sql.ts
 var executeSqlSchema = {
-  sql: z.string().describe("SQL query to execute (SELECT only)")
+  sql: z.string().describe("SQL query or multiple SQL statements to execute (separated by semicolons)")
 };
+function splitSQLStatements(sql2) {
+  return sql2.split(";").map((statement) => statement.trim()).filter((statement) => statement.length > 0);
+}
 function isReadOnlySQL(sql2, connectorType) {
   const normalizedSQL = sql2.trim().toLowerCase();
   const firstWord = normalizedSQL.split(/\s+/)[0];
   const keywordList = allowedKeywords[connectorType] || allowedKeywords.default || [];
   return keywordList.includes(firstWord);
 }
+function areAllStatementsReadOnly(sql2, connectorType) {
+  const statements = splitSQLStatements(sql2);
+  return statements.every((statement) => isReadOnlySQL(statement, connectorType));
+}
 async function executeSqlToolHandler({ sql: sql2 }, _extra) {
   const connector = ConnectorManager.getCurrentConnector();
   try {
-    if (isReadOnlyMode() && !isReadOnlySQL(sql2, connector.id)) {
+    if (isReadOnlyMode() && !areAllStatementsReadOnly(sql2, connector.id)) {
       return createToolErrorResponse(
         `Read-only mode is enabled. Only the following SQL operations are allowed: ${allowedKeywords[connector.id]?.join(", ") || "none"}`,
         "READONLY_VIOLATION"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bytebase/dbhub",
-  "version": "0.4.11",
+  "version": "0.5.0",
   "description": "Universal Database MCP Server",
   "main": "dist/index.js",
   "type": "module",