@bytebase/dbhub 0.22.6 → 0.24.0

package/dist/index.js

@@ -15,7 +15,11 @@ import {
   resolveSourceConfigs,
   resolveTomlConfigPath,
   resolveTransport
-} from "./chunk-WPXPKRDU.js";
+} from "./chunk-MQR6VX5F.js";
+import {
+  allowedKeywords,
+  isReadOnlySQL
+} from "./chunk-JO7YQPBQ.js";
 import {
   loadConnectors
 } from "./chunk-WVVMH6FJ.js";
@@ -27,8 +31,7 @@ import {
   getDatabaseTypeFromDSN,
   getDefaultPortForType,
   parseConnectionInfoFromDSN,
-  splitSQLStatements,
-  stripCommentsAndStrings
+  splitSQLStatements
 } from "./chunk-JEZZN2YZ.js";
 
 // src/server.ts
@@ -95,98 +98,6 @@ function createToolSuccessResponse(data, meta = {}) {
   };
 }
 
-// src/utils/allowed-keywords.ts
-var allowedKeywords = {
-  postgres: ["select", "with", "explain", "show"],
-  mysql: ["select", "with", "explain", "show", "describe", "desc"],
-  mariadb: ["select", "with", "explain", "show", "describe", "desc"],
-  sqlite: ["select", "with", "explain", "pragma"],
-  // 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",
-  "update",
-  "delete",
-  "drop",
-  "alter",
-  "create",
-  "truncate",
-  "merge",
-  "grant",
-  "revoke",
-  "rename"
-];
-var mutatingPattern = new RegExp(
-  `\\b(?:${mutatingKeywords.join("|")})\\b`,
-  "i"
-);
-var mutatingPatternWithReplace = new RegExp(
-  `\\b(?:${mutatingKeywords.join("|")}|replace\\s+(?:(?:low_priority|delayed)\\s+)?into)\\b`,
-  "i"
-);
-var mutatingPatterns = {
-  postgres: mutatingPattern,
-  mysql: mutatingPatternWithReplace,
-  mariadb: mutatingPatternWithReplace,
-  sqlite: mutatingPatternWithReplace,
-  sqlserver: mutatingPattern
-};
-var selectIntoPattern = /\bselect\b[\s\S]+\binto\b/i;
-var sqliteReadOnlyArgPragmas = /* @__PURE__ */ new Set([
-  "table_info",
-  "index_info",
-  "index_list",
-  "foreign_key_list"
-]);
-var sqlitePragmaParenPattern = /^pragma\s+(?:[a-z0-9_]+\.)?([a-z0-9_]+)\s*\(/;
-var explainAnalyzePattern = /^explain\s+(?:\([^)]*\banalyze\b(?!\s*(?:=\s*)?(?:false|off|0)\b)[^)]*\)|\banalyze\b(?!\s*(?:=\s*)?(?:false|off|0)\b)(?:\s+verbose\b)?)/i;
-function isReadOnlySQL(sql, connectorType) {
-  return checkReadOnly(
-    stripCommentsAndStrings(sql, connectorType).trim().toLowerCase(),
-    connectorType
-  );
-}
-function checkReadOnly(cleanedSQL, connectorType) {
-  if (!cleanedSQL) {
-    return false;
-  }
-  const firstWord = cleanedSQL.match(/\S+/)?.[0] ?? "";
-  const keywordList = allowedKeywords[connectorType] || [];
-  if (!keywordList.includes(firstWord)) {
-    return false;
-  }
-  if (firstWord === "with") {
-    const pattern = mutatingPatterns[connectorType] ?? mutatingPattern;
-    if (pattern.test(cleanedSQL)) {
-      return false;
-    }
-  }
-  if (firstWord === "pragma" && connectorType === "sqlite") {
-    if (cleanedSQL.includes("=")) {
-      return false;
-    }
-    const parenMatch = cleanedSQL.match(sqlitePragmaParenPattern);
-    if (parenMatch && !sqliteReadOnlyArgPragmas.has(parenMatch[1])) {
-      return false;
-    }
-  }
-  if ((firstWord === "select" || firstWord === "with") && selectIntoPattern.test(cleanedSQL)) {
-    return false;
-  }
-  if (firstWord === "explain") {
-    const m = explainAnalyzePattern.exec(cleanedSQL);
-    if (m) {
-      const afterExplain = cleanedSQL.slice(m[0].length).trim();
-      if (afterExplain && !checkReadOnly(afterExplain, connectorType)) {
-        return false;
-      }
-    }
-  }
-  return true;
-}
-
 // src/requests/store.ts
 var RequestStore = class {
   constructor() {
@@ -373,7 +284,7 @@ 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 });
+    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);
     }
@@ -506,7 +417,7 @@ async function searchViews(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;
@@ -1672,7 +1583,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-IPRZ55YC.js");
+    const { initializeToolRegistry: initializeToolRegistry2 } = await import("./registry-ZU6ZFNQ2.js");
     initializeToolRegistry2({
       sources: sourceConfigsData.sources,
       tools: sourceConfigsData.tools
@@ -1826,11 +1737,11 @@ See documentation for more details on configuring database connections.
 
 // src/index.ts
 var connectorModules = [
-  { load: () => import("./postgres-BKBCGDZS.js"), name: "PostgreSQL", driver: "pg" },
-  { load: () => import("./sqlserver-47APXMSF.js"), name: "SQL Server", driver: "mssql" },
-  { load: () => import("./sqlite-CQ4LCBB6.js"), name: "SQLite", driver: "node:sqlite" },
-  { load: () => import("./mysql-EK6TCER5.js"), name: "MySQL", driver: "mysql2" },
-  { load: () => import("./mariadb-JPEKVFEW.js"), name: "MariaDB", driver: "mariadb" }
+  { load: () => import("./postgres-ZQFXCBYA.js"), name: "PostgreSQL", driver: "pg" },
+  { load: () => import("./sqlserver-LHWZ7WOP.js"), name: "SQL Server", driver: "mssql" },
+  { load: () => import("./sqlite-JH5CNV5E.js"), name: "SQLite", driver: "node:sqlite" },
+  { load: () => import("./mysql-MHIZK2UY.js"), name: "MySQL", driver: "mysql2" },
+  { load: () => import("./mariadb-VZMU7LYA.js"), name: "MariaDB", driver: "mariadb" }
 ];
 loadConnectors(connectorModules).then(() => main()).catch((error) => {
   console.error("Fatal error:", error);

package/dist/{mariadb-JPEKVFEW.js → mariadb-VZMU7LYA.js}

@@ -1,13 +1,18 @@
 import {
+  MissingDatabaseError,
   extractAffectedRows,
-  parseQueryResults
-} from "./chunk-RTB262PR.js";
+  isTiDBVersion,
+  parseQueryResults,
+  requireDatabaseInDSN,
+  withReadOnlyTransaction
+} from "./chunk-DUCNPMNW.js";
 import {
   quoteIdentifier
 } from "./chunk-JFWX35TB.js";
 import {
-  SQLRowLimiter
-} from "./chunk-BXXHWEQS.js";
+  SQLRowLimiter,
+  closeQuietly
+} from "./chunk-D2BIPC7V.js";
 import {
   ConnectorRegistry,
   SafeURL,
@@ -32,11 +37,12 @@ Expected: ${expectedFormat}`
     }
     try {
       const url = new SafeURL(dsn);
+      const database = url.pathname ? url.pathname.substring(1) : "";
+      requireDatabaseInDSN(database, dsn, "MariaDB");
       const connectionConfig = {
         host: url.hostname,
         port: url.port ? parseInt(url.port) : 3306,
-        database: url.pathname ? url.pathname.substring(1) : "",
-        // Remove leading '/' if exists
+        database,
         user: url.username,
         password: url.password,
         multipleStatements: true,
@@ -50,7 +56,14 @@ Expected: ${expectedFormat}`
         // Controls how the driver interprets DATETIME values ("Z", "local", or "±HH:MM").
         ...config?.timezone !== void 0 && {
           timezone: config.timezone
-        }
+        },
+        // Connection character set (e.g. "utf8mb4") / collation (e.g.
+        // "utf8mb4_general_ci"). The mariadb driver exposes both as distinct
+        // options, but a configured collation is authoritative (it implies its
+        // character set) and the driver ignores `collation` when `charset` is also
+        // passed. So forward the collation when present, otherwise the charset
+        // (which uses that character set's default collation).
+        ...config?.collation !== void 0 ? { collation: config.collation } : config?.charset !== void 0 ? { charset: config.charset } : {}
       };
       url.forEachSearchParam((value, key) => {
         if (key === "sslmode") {
@@ -70,6 +83,9 @@ Expected: ${expectedFormat}`
       }
       return connectionConfig;
     } catch (error) {
+      if (error instanceof MissingDatabaseError) {
+        throw error;
+      }
       throw new Error(
         `Failed to parse MariaDB DSN: ${error instanceof Error ? error.message : String(error)}`
       );
@@ -94,6 +110,9 @@ var MariaDBConnector = class _MariaDBConnector {
     this.pool = null;
     // Source ID is set by ConnectorManager after cloning
     this.sourceId = "default";
+    // TiDB speaks the MySQL protocol but rejects `START TRANSACTION READ ONLY`
+    // unless tidb_enable_noop_functions is on. Detected once at connect time.
+    this.supportsReadOnlyTransaction = true;
   }
   getId() {
     return this.sourceId;
@@ -105,8 +124,14 @@ var MariaDBConnector = class _MariaDBConnector {
     try {
       const connectionConfig = await this.dsnParser.parse(dsn, config);
       this.pool = mariadb.createPool(connectionConfig);
-      await this.pool.query("SELECT 1");
+      const rows = await this.pool.query("SELECT VERSION() AS version");
+      this.supportsReadOnlyTransaction = !isTiDBVersion(rows?.[0]?.version);
     } catch (err) {
+      if (this.pool) {
+        const pool = this.pool;
+        this.pool = null;
+        await closeQuietly(() => pool.end());
+      }
       console.error("Failed to connect to MariaDB database:", err);
       throw err;
     }
@@ -466,46 +491,41 @@ var MariaDBConnector = class _MariaDBConnector {
     }
     const conn = await this.pool.getConnection();
     try {
-      if (options.readonly) {
-        await conn.query("START TRANSACTION READ ONLY");
-      }
-      let processedSQL = sql;
-      if (options.maxRows) {
-        const statements = splitSQLStatements(sql, "mariadb");
-        const processedStatements = statements.map(
-          (statement) => SQLRowLimiter.applyMaxRows(statement, options.maxRows)
-        );
-        processedSQL = processedStatements.join("; ");
-        if (sql.trim().endsWith(";")) {
-          processedSQL += ";";
-        }
-      }
-      let results;
-      if (parameters && parameters.length > 0) {
-        try {
-          results = await conn.query(processedSQL, parameters);
-        } catch (error) {
-          console.error(`[MariaDB executeSQL] ERROR: ${error.message}`);
-          console.error(`[MariaDB executeSQL] SQL: ${processedSQL}`);
-          console.error(`[MariaDB executeSQL] Parameters: ${JSON.stringify(parameters)}`);
-          throw error;
+      return await withReadOnlyTransaction(
+        conn,
+        options.readonly,
+        this.supportsReadOnlyTransaction,
+        async () => {
+          let processedSQL = sql;
+          if (options.maxRows) {
+            const statements = splitSQLStatements(sql, "mariadb");
+            const processedStatements = statements.map(
+              (statement) => SQLRowLimiter.applyMaxRows(statement, options.maxRows)
+            );
+            processedSQL = processedStatements.join("; ");
+            if (sql.trim().endsWith(";")) {
+              processedSQL += ";";
+            }
+          }
+          let results;
+          if (parameters && parameters.length > 0) {
+            try {
+              results = await conn.query(processedSQL, parameters);
+            } catch (error) {
+              console.error(`[MariaDB executeSQL] ERROR: ${error.message}`);
+              console.error(`[MariaDB executeSQL] SQL: ${processedSQL}`);
+              console.error(`[MariaDB executeSQL] Parameters: ${JSON.stringify(parameters)}`);
+              throw error;
+            }
+          } else {
+            results = await conn.query(processedSQL);
+          }
+          const rows = parseQueryResults(results);
+          const rowCount = extractAffectedRows(results);
+          return { rows, rowCount };
         }
-      } else {
-        results = await conn.query(processedSQL);
-      }
-      const rows = parseQueryResults(results);
-      const rowCount = extractAffectedRows(results);
-      if (options.readonly) {
-        await conn.query("COMMIT");
-      }
-      return { rows, rowCount };
+      );
     } catch (error) {
-      if (options.readonly) {
-        try {
-          await conn.query("ROLLBACK");
-        } catch {
-        }
-      }
       console.error("Error executing query:", error);
       throw error;
     } finally {

package/dist/{mysql-EK6TCER5.js → mysql-MHIZK2UY.js}

@@ -1,13 +1,18 @@
 import {
+  MissingDatabaseError,
   extractAffectedRows,
-  parseQueryResults
-} from "./chunk-RTB262PR.js";
+  isTiDBVersion,
+  parseQueryResults,
+  requireDatabaseInDSN,
+  withReadOnlyTransaction
+} from "./chunk-DUCNPMNW.js";
 import {
   quoteIdentifier
 } from "./chunk-JFWX35TB.js";
 import {
-  SQLRowLimiter
-} from "./chunk-BXXHWEQS.js";
+  SQLRowLimiter,
+  closeQuietly
+} from "./chunk-D2BIPC7V.js";
 import {
   ConnectorRegistry,
   SafeURL,
@@ -21,6 +26,8 @@ var MySQLDSNParser = class {
   async parse(dsn, config) {
     const connectionTimeoutSeconds = config?.connectionTimeoutSeconds;
     const timezone = config?.timezone;
+    const charset = config?.charset;
+    const collation = config?.collation;
     if (!this.isValidDSN(dsn)) {
       const obfuscatedDSN = obfuscateDSNPassword(dsn);
       const expectedFormat = this.getSampleDSN();
@@ -32,11 +39,12 @@ Expected: ${expectedFormat}`
     }
     try {
       const url = new SafeURL(dsn);
+      const database = url.pathname ? url.pathname.substring(1) : "";
+      requireDatabaseInDSN(database, dsn, "MySQL");
       const config2 = {
         host: url.hostname,
         port: url.port ? parseInt(url.port) : 3306,
-        database: url.pathname ? url.pathname.substring(1) : "",
-        // Remove leading '/' if exists
+        database,
         user: url.username,
         password: url.password,
         multipleStatements: true,
@@ -61,6 +69,10 @@ Expected: ${expectedFormat}`
       if (timezone !== void 0) {
         config2.timezone = timezone;
       }
+      const charsetOrCollation = collation ?? charset;
+      if (charsetOrCollation !== void 0) {
+        config2.charset = charsetOrCollation;
+      }
       if (url.password && url.password.includes("X-Amz-Credential")) {
         config2.authPlugins = {
           mysql_clear_password: () => () => {
@@ -73,6 +85,9 @@ Expected: ${expectedFormat}`
       }
       return config2;
     } catch (error) {
+      if (error instanceof MissingDatabaseError) {
+        throw error;
+      }
       throw new Error(
         `Failed to parse MySQL DSN: ${error instanceof Error ? error.message : String(error)}`
       );
@@ -97,6 +112,9 @@ var MySQLConnector = class _MySQLConnector {
     this.pool = null;
     // Source ID is set by ConnectorManager after cloning
     this.sourceId = "default";
+    // TiDB speaks the MySQL protocol but rejects `START TRANSACTION READ ONLY`
+    // unless tidb_enable_noop_functions is on. Detected once at connect time.
+    this.supportsReadOnlyTransaction = true;
   }
   getId() {
     return this.sourceId;
@@ -111,8 +129,14 @@ var MySQLConnector = class _MySQLConnector {
       if (config?.queryTimeoutSeconds !== void 0) {
         this.queryTimeoutMs = config.queryTimeoutSeconds * 1e3;
       }
-      const [rows] = await this.pool.query("SELECT 1");
+      const [rows] = await this.pool.query("SELECT VERSION() AS version");
+      this.supportsReadOnlyTransaction = !isTiDBVersion(rows[0]?.version);
     } catch (err) {
+      if (this.pool) {
+        const pool = this.pool;
+        this.pool = null;
+        await closeQuietly(() => pool.end());
+      }
       console.error("Failed to connect to MySQL database:", err);
       throw err;
     }
@@ -472,47 +496,42 @@ var MySQLConnector = class _MySQLConnector {
     }
     const conn = await this.pool.getConnection();
     try {
-      if (options.readonly) {
-        await conn.query("START TRANSACTION READ ONLY");
-      }
-      let processedSQL = sql;
-      if (options.maxRows) {
-        const statements = splitSQLStatements(sql, "mysql");
-        const processedStatements = statements.map(
-          (statement) => SQLRowLimiter.applyMaxRows(statement, options.maxRows)
-        );
-        processedSQL = processedStatements.join("; ");
-        if (sql.trim().endsWith(";")) {
-          processedSQL += ";";
-        }
-      }
-      let results;
-      if (parameters && parameters.length > 0) {
-        try {
-          results = await conn.query({ sql: processedSQL, timeout: this.queryTimeoutMs }, parameters);
-        } catch (error) {
-          console.error(`[MySQL executeSQL] ERROR: ${error.message}`);
-          console.error(`[MySQL executeSQL] SQL: ${processedSQL}`);
-          console.error(`[MySQL executeSQL] Parameters: ${JSON.stringify(parameters)}`);
-          throw error;
+      return await withReadOnlyTransaction(
+        conn,
+        options.readonly,
+        this.supportsReadOnlyTransaction,
+        async () => {
+          let processedSQL = sql;
+          if (options.maxRows) {
+            const statements = splitSQLStatements(sql, "mysql");
+            const processedStatements = statements.map(
+              (statement) => SQLRowLimiter.applyMaxRows(statement, options.maxRows)
+            );
+            processedSQL = processedStatements.join("; ");
+            if (sql.trim().endsWith(";")) {
+              processedSQL += ";";
+            }
+          }
+          let results;
+          if (parameters && parameters.length > 0) {
+            try {
+              results = await conn.query({ sql: processedSQL, timeout: this.queryTimeoutMs }, parameters);
+            } catch (error) {
+              console.error(`[MySQL executeSQL] ERROR: ${error.message}`);
+              console.error(`[MySQL executeSQL] SQL: ${processedSQL}`);
+              console.error(`[MySQL executeSQL] Parameters: ${JSON.stringify(parameters)}`);
+              throw error;
+            }
+          } else {
+            results = await conn.query({ sql: processedSQL, timeout: this.queryTimeoutMs });
+          }
+          const [firstResult] = results;
+          const rows = parseQueryResults(firstResult);
+          const rowCount = extractAffectedRows(firstResult);
+          return { rows, rowCount };
         }
-      } else {
-        results = await conn.query({ sql: processedSQL, timeout: this.queryTimeoutMs });
-      }
-      const [firstResult] = results;
-      const rows = parseQueryResults(firstResult);
-      const rowCount = extractAffectedRows(firstResult);
-      if (options.readonly) {
-        await conn.query("COMMIT");
-      }
-      return { rows, rowCount };
+      );
     } catch (error) {
-      if (options.readonly) {
-        try {
-          await conn.query("ROLLBACK");
-        } catch {
-        }
-      }
       console.error("Error executing query:", error);
       throw error;
     } finally {

package/dist/{postgres-BKBCGDZS.js → postgres-ZQFXCBYA.js}

@@ -2,8 +2,9 @@ import {
   quoteIdentifier
 } from "./chunk-JFWX35TB.js";
 import {
-  SQLRowLimiter
-} from "./chunk-BXXHWEQS.js";
+  SQLRowLimiter,
+  closeQuietly
+} from "./chunk-D2BIPC7V.js";
 import {
   ConnectorRegistry,
   SafeURL,
@@ -148,6 +149,11 @@ var PostgresConnector = class _PostgresConnector {
       const client = await this.pool.connect();
       client.release();
     } catch (err) {
+      if (this.pool) {
+        const pool = this.pool;
+        this.pool = null;
+        await closeQuietly(() => pool.end());
+      }
       console.error("Failed to connect to PostgreSQL database:", err);
       throw err;
     }

package/dist/{registry-IPRZ55YC.js → registry-ZU6ZFNQ2.js}

@@ -2,7 +2,7 @@ import {
   ToolRegistry,
   getToolRegistry,
   initializeToolRegistry
-} from "./chunk-WPXPKRDU.js";
+} from "./chunk-MQR6VX5F.js";
 import "./chunk-WVVMH6FJ.js";
 import "./chunk-JEZZN2YZ.js";
 export {

package/dist/{sqlite-CQ4LCBB6.js → sqlite-JH5CNV5E.js}

@@ -2,8 +2,9 @@ import {
   quoteIdentifier
 } from "./chunk-JFWX35TB.js";
 import {
-  SQLRowLimiter
-} from "./chunk-BXXHWEQS.js";
+  SQLRowLimiter,
+  closeQuietly
+} from "./chunk-D2BIPC7V.js";
 import {
   ConnectorRegistry,
   SafeURL,
@@ -150,6 +151,11 @@ var SQLiteConnector = class _SQLiteConnector {
         this.db.exec(initScript);
       }
     } catch (error) {
+      if (this.db) {
+        const db = this.db;
+        this.db = null;
+        await closeQuietly(() => db.close());
+      }
       console.error("Failed to connect to SQLite database:", error);
       throw error;
     }