@bytebase/dbhub 0.22.6 → 0.24.0

package/README.md

@@ -80,6 +80,10 @@ docker run --rm --init \
 npx @bytebase/dbhub@latest --transport http --port 8080 --dsn "postgres://user:password@localhost:5432/dbname?sslmode=disable"
 ```
 
+**MCP Bundle (one-click install):**
+
+Download `dbhub-<version>.mcpb` from the [latest release](https://github.com/bytebase/dbhub/releases/latest) and install it in any [MCPB-compatible client](https://github.com/modelcontextprotocol/mcpb) — Claude Desktop (double-click, or drag into Settings → Extensions), Claude Code, or MCP for Windows — then enter your database connection string. The bundle runs locally over stdio, is **read-only by design** (writes are rejected and the database session is set to read-only at the engine level), and needs no remote endpoint or OAuth setup — ideal for giving non-technical teammates curated, read-only database access. Pair it with a least-privilege, read-only database account. See the [MCP Bundle guide](https://dbhub.ai/mcpb) for details and for packaging your own bundle.
+
 **Demo Mode:**
 
 ```bash

package/dist/{chunk-BXXHWEQS.js → chunk-D2BIPC7V.js}

@@ -122,6 +122,15 @@ var SQLRowLimiter = class {
   }
 };
 
+// src/utils/resource-cleanup.ts
+async function closeQuietly(close) {
+  try {
+    await close();
+  } catch {
+  }
+}
+
 export {
-  SQLRowLimiter
+  SQLRowLimiter,
+  closeQuietly
 };

package/dist/{chunk-RTB262PR.js → chunk-DUCNPMNW.js}

@@ -1,3 +1,26 @@
+import {
+  obfuscateDSNPassword
+} from "./chunk-JEZZN2YZ.js";
+
+// src/utils/dsn-database.ts
+var MissingDatabaseError = class extends Error {
+  constructor(message) {
+    super(message);
+    this.name = "MissingDatabaseError";
+  }
+};
+function requireDatabaseInDSN(database, dsn, label) {
+  if (database) {
+    return;
+  }
+  throw new MissingDatabaseError(
+    `${label} DSN must name a database.
+Provided: ${obfuscateDSNPassword(dsn)}
+Add the database to the DSN, e.g. ...:3306/mydb
+To work with several databases, define one [[sources]] entry per database in a TOML config file: https://dbhub.ai/config/toml`
+  );
+}
+
 // src/utils/multi-statement-result-parser.ts
 function isMetadataObject(element) {
   if (!element || typeof element !== "object" || Array.isArray(element)) {
@@ -54,7 +77,37 @@ function parseQueryResults(results) {
   return results;
 }
 
+// src/utils/readonly-transaction.ts
+async function withReadOnlyTransaction(conn, readonly, supportsReadOnlyTransaction, execute) {
+  if (!readonly) {
+    return execute();
+  }
+  try {
+    await conn.query(
+      supportsReadOnlyTransaction ? "START TRANSACTION READ ONLY" : "START TRANSACTION"
+    );
+    const result = await execute();
+    await conn.query(supportsReadOnlyTransaction ? "COMMIT" : "ROLLBACK");
+    return result;
+  } catch (error) {
+    try {
+      await conn.query("ROLLBACK");
+    } catch {
+    }
+    throw error;
+  }
+}
+
+// src/utils/server-flavor.ts
+function isTiDBVersion(version) {
+  return typeof version === "string" && /tidb/i.test(version);
+}
+
 export {
+  MissingDatabaseError,
+  requireDatabaseInDSN,
   extractAffectedRows,
-  parseQueryResults
+  parseQueryResults,
+  withReadOnlyTransaction,
+  isTiDBVersion
 };

package/dist/chunk-JO7YQPBQ.js

@@ -0,0 +1,130 @@
+import {
+  stripCommentsAndStrings
+} from "./chunk-JEZZN2YZ.js";
+
+// 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 sqlServerDynamicSqlKeywords = [
+  "execute",
+  "exec",
+  "sp_executesql",
+  "xp_cmdshell"
+];
+var sqlServerDynamicSqlPattern = new RegExp(
+  `\\b(?:${sqlServerDynamicSqlKeywords.join("|")})\\b`,
+  "i"
+);
+var sqlServerPassThroughKeywords = [
+  "openquery",
+  "openrowset",
+  "opendatasource"
+];
+var sqlServerPassThroughPattern = new RegExp(
+  `\\b(?:${sqlServerPassThroughKeywords.join("|")})\\s*\\(`,
+  "i"
+);
+var mutatingPatternSqlServer = new RegExp(
+  `\\b(?:${[...mutatingKeywords, ...sqlServerDynamicSqlKeywords].join("|")})\\b`,
+  "i"
+);
+var mutatingPatterns = {
+  postgres: mutatingPattern,
+  mysql: mutatingPatternWithReplace,
+  mariadb: mutatingPatternWithReplace,
+  sqlite: mutatingPatternWithReplace,
+  sqlserver: mutatingPatternSqlServer
+};
+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 (connectorType === "sqlserver" && sqlServerPassThroughPattern.test(cleanedSQL)) {
+    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;
+}
+
+export {
+  allowedKeywords,
+  sqlServerDynamicSqlKeywords,
+  sqlServerDynamicSqlPattern,
+  sqlServerPassThroughKeywords,
+  sqlServerPassThroughPattern,
+  isReadOnlySQL
+};

package/dist/{chunk-WPXPKRDU.js → chunk-MQR6VX5F.js}

@@ -68,7 +68,8 @@ function findDefaultSSHKey() {
   }
   return void 0;
 }
-function parseSSHConfig(hostAlias, configPath) {
+function parseSSHConfig(hostAlias, configPath, options = {}) {
+  const { requireUser = true } = options;
   const sshConfigPath = resolveSymlink(configPath);
   if (!isFile(sshConfigPath)) {
     return null;
@@ -77,7 +78,7 @@ function parseSSHConfig(hostAlias, configPath) {
     const configContent = readFileSync(sshConfigPath, "utf8");
     const config = SSHConfig.parse(configContent);
     const hostConfig = config.compute(hostAlias);
-    if (!hostConfig || !hostConfig.HostName && !hostConfig.User) {
+    if (!hostConfig || !hostConfig.HostName && !hostConfig.User && !hostConfig.Port && !hostConfig.IdentityFile && !hostConfig.ProxyJump) {
       return null;
     }
     const sshConfig = {};
@@ -111,10 +112,10 @@ function parseSSHConfig(hostAlias, configPath) {
     if (hostConfig.ProxyCommand) {
       console.error("Warning: ProxyCommand in SSH config is not supported by DBHub. Use ProxyJump instead.");
     }
-    if (!sshConfig.host || !sshConfig.username) {
+    if (!sshConfig.host || requireUser && !sshConfig.username) {
       return null;
     }
-    return sshConfig;
+    return requireUser ? sshConfig : sshConfig;
   } catch (error) {
     console.error(`Error parsing SSH config: ${error instanceof Error ? error.message : String(error)}`);
     return null;
@@ -193,6 +194,45 @@ function parseJumpHosts(proxyJump) {
   }
   return proxyJump.split(",").map((s) => s.trim()).filter((s) => s.length > 0).map(parseJumpHost);
 }
+function resolveJumpHosts(proxyJump, configPath, visited = /* @__PURE__ */ new Set()) {
+  if (!proxyJump || proxyJump.trim() === "" || proxyJump.toLowerCase() === "none") {
+    return [];
+  }
+  const resolved = [];
+  for (const token of proxyJump.split(",").map((s) => s.trim()).filter((s) => s.length > 0)) {
+    const hop = parseJumpHost(token);
+    if (!looksLikeSSHAlias(hop.host)) {
+      resolved.push(hop);
+      continue;
+    }
+    if (visited.has(hop.host)) {
+      throw new Error(`Cycle detected in SSH ProxyJump chain at alias "${hop.host}"`);
+    }
+    const aliasConfig = parseSSHConfig(hop.host, configPath, { requireUser: false });
+    if (!aliasConfig) {
+      resolved.push(hop);
+      continue;
+    }
+    if (aliasConfig.proxyJump) {
+      resolved.push(...resolveJumpHosts(aliasConfig.proxyJump, configPath, new Set(visited).add(hop.host)));
+    }
+    resolved.push({
+      host: aliasConfig.host,
+      // An explicit `:port` on the token wins; otherwise use the alias's Port (default 22).
+      port: tokenHasExplicitPort(token) ? hop.port : aliasConfig.port ?? 22,
+      // An explicit `user@` on the token wins; otherwise the alias's User.
+      username: hop.username ?? aliasConfig.username,
+      privateKey: aliasConfig.privateKey,
+      passphrase: aliasConfig.passphrase
+    });
+  }
+  return resolved;
+}
+function tokenHasExplicitPort(token) {
+  const atIndex = token.indexOf("@");
+  const hostPart = atIndex !== -1 ? token.slice(atIndex + 1) : token;
+  return hostPart.startsWith("[") ? /\]:\d+$/.test(hostPart) : /:\d+$/.test(hostPart);
+}
 
 // src/utils/ssh-tunnel.ts
 var SSHTunnel = class {
@@ -215,29 +255,8 @@ var SSHTunnel = class {
     }
     this.isConnected = true;
     try {
-      const jumpHosts = config.proxyJump ? parseJumpHosts(config.proxyJump) : [];
-      let privateKeyBuffer;
-      if (config.privateKey) {
-        try {
-          const resolvedKeyPath = resolveSymlink(config.privateKey);
-          privateKeyBuffer = readFileSync2(resolvedKeyPath);
-        } catch {
-          try {
-            const decoded = Buffer.from(config.privateKey, "base64");
-            const text = decoded.toString("utf8");
-            if (text.includes("PRIVATE KEY")) {
-              privateKeyBuffer = decoded;
-            } else {
-              throw new Error(`SSH key is neither a valid file path nor a base64-encoded private key`);
-            }
-          } catch (decodeError) {
-            if (decodeError instanceof Error && decodeError.message.includes("neither a valid file path")) {
-              throw decodeError;
-            }
-            throw new Error(`SSH key is neither a valid file path nor a base64-encoded private key`);
-          }
-        }
-      }
+      const jumpHosts = config.resolvedJumpHosts ?? (config.proxyJump ? parseJumpHosts(config.proxyJump) : []);
+      const privateKeyBuffer = config.privateKey ? this.loadPrivateKey(config.privateKey) : void 0;
       if (!config.password && !privateKeyBuffer) {
         throw new Error("Either password or privateKey must be provided for SSH authentication");
       }
@@ -248,6 +267,30 @@ var SSHTunnel = class {
       throw error;
     }
   }
+  /**
+   * Load an SSH private key, supporting both a file path (with symlink resolution)
+   * and base64-encoded key content.
+   */
+  loadPrivateKey(key) {
+    try {
+      const resolvedKeyPath = resolveSymlink(key);
+      return readFileSync2(resolvedKeyPath);
+    } catch {
+      try {
+        const decoded = Buffer.from(key, "base64");
+        const text = decoded.toString("utf8");
+        if (text.includes("PRIVATE KEY")) {
+          return decoded;
+        }
+        throw new Error("SSH key is neither a valid file path nor a base64-encoded private key");
+      } catch (decodeError) {
+        if (decodeError instanceof Error && decodeError.message.includes("neither a valid file path")) {
+          throw decodeError;
+        }
+        throw new Error("SSH key is neither a valid file path nor a base64-encoded private key");
+      }
+    }
+  }
   /**
    * Establish a chain of SSH connections through jump hosts.
    * @returns The final SSH client connected to the target host
@@ -257,6 +300,9 @@ var SSHTunnel = class {
     for (let i = 0; i < jumpHosts.length; i++) {
       const jumpHost = jumpHosts[i];
       const nextHost = i + 1 < jumpHosts.length ? jumpHosts[i + 1] : { host: targetConfig.host, port: targetConfig.port || 22 };
+      const hopPrivateKey = jumpHost.privateKey ? this.loadPrivateKey(jumpHost.privateKey) : privateKey;
+      const hopPassword = targetConfig.password;
+      const hopPassphrase = jumpHost.passphrase ?? targetConfig.passphrase;
       let client = null;
       let forwardStream;
       try {
@@ -266,9 +312,9 @@ var SSHTunnel = class {
             port: jumpHost.port,
             username: jumpHost.username || targetConfig.username
           },
-          targetConfig.password,
-          privateKey,
-          targetConfig.passphrase,
+          hopPassword,
+          hopPrivateKey,
+          hopPassphrase,
           previousStream,
           `jump host ${i + 1}`,
           targetConfig.keepaliveInterval,
@@ -534,55 +580,59 @@ function parseCommandLineArgs() {
   }
   return parsedManually;
 }
-function loadEnvFiles() {
+function findEnvFile() {
   const isDevelopment = process.env.NODE_ENV === "development" || process.argv[1]?.includes("tsx");
   const envFileNames = isDevelopment ? [".env.local", ".env"] : [".env"];
   const envPaths = [];
   for (const fileName of envFileNames) {
     envPaths.push(
-      fileName,
+      path.join(process.cwd(), fileName),
       // Current working directory
-      path.join(__dirname, "..", "..", fileName),
+      path.join(__dirname, "..", "..", fileName)
       // Two levels up (src/config -> src -> root)
-      path.join(process.cwd(), fileName)
-      // Explicit current working directory
     );
   }
   for (const envPath of envPaths) {
-    console.error(`Checking for env file: ${envPath}`);
     if (fs.existsSync(envPath)) {
-      dotenv.config({ path: envPath });
-      if (process.env.READONLY !== void 0) {
-        console.error("\nERROR: READONLY environment variable is no longer supported.");
-        console.error("Use dbhub.toml with [[tools]] configuration instead:\n");
-        console.error("  [[sources]]");
-        console.error('  id = "default"');
-        console.error('  dsn = "..."\n');
-        console.error("  [[tools]]");
-        console.error('  name = "execute_sql"');
-        console.error('  source = "default"');
-        console.error("  readonly = true\n");
-        console.error("See https://dbhub.ai/tools/execute-sql#read-only-mode for details.\n");
-        process.exit(1);
-      }
-      if (process.env.MAX_ROWS !== void 0) {
-        console.error("\nERROR: MAX_ROWS environment variable is no longer supported.");
-        console.error("Use dbhub.toml with [[tools]] configuration instead:\n");
-        console.error("  [[sources]]");
-        console.error('  id = "default"');
-        console.error('  dsn = "..."\n');
-        console.error("  [[tools]]");
-        console.error('  name = "execute_sql"');
-        console.error('  source = "default"');
-        console.error("  max_rows = 1000\n");
-        console.error("See https://dbhub.ai/tools/execute-sql#row-limiting for details.\n");
-        process.exit(1);
-      }
-      return path.basename(envPath);
+      return envPath;
     }
   }
   return null;
 }
+function loadEnvFiles() {
+  const envPath = findEnvFile();
+  if (envPath) {
+    dotenv.config({ path: envPath });
+    if (process.env.READONLY !== void 0) {
+      console.error("\nERROR: READONLY environment variable is no longer supported.");
+      console.error("Use dbhub.toml with [[tools]] configuration instead:\n");
+      console.error("  [[sources]]");
+      console.error('  id = "default"');
+      console.error('  dsn = "..."\n');
+      console.error("  [[tools]]");
+      console.error('  name = "execute_sql"');
+      console.error('  source = "default"');
+      console.error("  readonly = true\n");
+      console.error("See https://dbhub.ai/tools/execute-sql#read-only-mode for details.\n");
+      process.exit(1);
+    }
+    if (process.env.MAX_ROWS !== void 0) {
+      console.error("\nERROR: MAX_ROWS environment variable is no longer supported.");
+      console.error("Use dbhub.toml with [[tools]] configuration instead:\n");
+      console.error("  [[sources]]");
+      console.error('  id = "default"');
+      console.error('  dsn = "..."\n');
+      console.error("  [[tools]]");
+      console.error('  name = "execute_sql"');
+      console.error('  source = "default"');
+      console.error("  max_rows = 1000\n");
+      console.error("See https://dbhub.ai/tools/execute-sql#row-limiting for details.\n");
+      process.exit(1);
+    }
+    return path.basename(envPath);
+  }
+  return null;
+}
 function isDemoMode() {
   const args = parseCommandLineArgs();
   return args.demo === "true";
@@ -877,6 +927,9 @@ function resolveSSHConfig() {
   };
 }
 async function resolveSourceConfigs() {
+  if (parseCommandLineArgs().config) {
+    loadEnvFiles();
+  }
   if (!isDemoMode()) {
     const tomlConfig = loadTomlConfig();
     if (tomlConfig) {
@@ -886,6 +939,11 @@ async function resolveSourceConfigs() {
           "The --id flag cannot be used with TOML configuration. TOML config defines source IDs directly. Either remove the --id flag or use command-line DSN configuration instead."
         );
       }
+      if (parseCommandLineArgs().dsn) {
+        throw new Error(
+          `The --dsn flag cannot be used with TOML configuration (${tomlConfig.source}). TOML config defines database sources directly and supports multiple databases, while a DSN configures a single database. Either remove the --dsn flag or drop the --config flag.`
+        );
+      }
       return tomlConfig;
     }
   }
@@ -993,8 +1051,9 @@ function loadTomlConfig() {
 }
 function resolveTomlConfigPath() {
   const args = parseCommandLineArgs();
-  if (args.config) {
-    const configPath = expandHomeDir(args.config);
+  const configValue = requireFlagValue("config", args, "./dbhub.toml");
+  if (configValue) {
+    const configPath = expandHomeDir(configValue);
     if (!fs2.existsSync(configPath)) {
       throw new Error(
         `Configuration file specified by --config flag not found: ${configPath}`
@@ -1002,10 +1061,6 @@ function resolveTomlConfigPath() {
     }
     return configPath;
   }
-  const defaultConfigPath = path2.join(process.cwd(), "dbhub.toml");
-  if (fs2.existsSync(defaultConfigPath)) {
-    return defaultConfigPath;
-  }
   return null;
 }
 function validateTomlConfig(config, configPath) {
@@ -1160,6 +1215,11 @@ function validateDSNFieldConflicts(source, configPath) {
     if (source.database && info.database && source.database !== info.database) {
       conflict("database", source.database, info.database);
     }
+    if (source.database && !info.database) {
+      throw new Error(
+        `Configuration file ${configPath}: source '${source.id}' has a 'database' field but the DSN names no database. The field is ignored at connection time \u2014 add the database to the DSN, or use individual connection parameters instead of a DSN.`
+      );
+    }
     if (source.user && info.user && source.user !== info.user) {
       conflict("user", source.user, info.user);
     }
@@ -1367,6 +1427,30 @@ function validateSourceConfig(source, configPath) {
       );
     }
   }
+  if (source.charset !== void 0) {
+    if (source.type !== "mysql" && source.type !== "mariadb") {
+      throw new Error(
+        `Configuration file ${configPath}: source '${source.id}' has 'charset' but it is only supported for MySQL and MariaDB sources.`
+      );
+    }
+    if (typeof source.charset !== "string" || source.charset.trim() === "") {
+      throw new Error(
+        `Configuration file ${configPath}: source '${source.id}' has invalid charset '${source.charset}'. Must be a non-empty string naming a character set (e.g. "utf8mb4").`
+      );
+    }
+  }
+  if (source.collation !== void 0) {
+    if (source.type !== "mysql" && source.type !== "mariadb") {
+      throw new Error(
+        `Configuration file ${configPath}: source '${source.id}' has 'collation' but it is only supported for MySQL and MariaDB sources.`
+      );
+    }
+    if (typeof source.collation !== "string" || source.collation.trim() === "") {
+      throw new Error(
+        `Configuration file ${configPath}: source '${source.id}' has invalid collation '${source.collation}'. Must be a non-empty string naming a collation (e.g. "utf8mb4_0900_ai_ci").`
+      );
+    }
+  }
   if (source.readonly !== void 0) {
     throw new Error(
       `Configuration file ${configPath}: source '${source.id}' has 'readonly' field, but readonly must be configured per-tool, not per-source. Move 'readonly' to [[tools]] configuration instead.`
@@ -1735,13 +1819,23 @@ var ConnectorManager = class {
     console.error(`  - ${sourceId}: ${redactDSN(dsn)}`);
     let actualDSN = dsn;
     if (source.ssh_host) {
+      const sshConfigPath = getDefaultSSHConfigPath();
       let resolvedSSHConfig = null;
       if (looksLikeSSHAlias(source.ssh_host)) {
-        const sshConfigPath = getDefaultSSHConfigPath();
         console.error(`  Resolving SSH config for host '${source.ssh_host}' from: ${sshConfigPath}`);
         resolvedSSHConfig = parseSSHConfig(source.ssh_host, sshConfigPath);
       }
       const username = source.ssh_user || resolvedSSHConfig?.username;
+      const proxyJump = source.ssh_proxy_jump || resolvedSSHConfig?.proxyJump;
+      let resolvedJumpHosts;
+      try {
+        resolvedJumpHosts = proxyJump ? resolveJumpHosts(proxyJump, sshConfigPath) : void 0;
+      } catch (error) {
+        if (error && typeof error === "object") {
+          error[TUNNEL_ERROR_MARKER] = true;
+        }
+        throw error;
+      }
       const sshConfig = {
         host: resolvedSSHConfig?.host || source.ssh_host,
         port: source.ssh_port || resolvedSSHConfig?.port || 22,
@@ -1749,7 +1843,8 @@ var ConnectorManager = class {
         password: source.ssh_password,
         privateKey: source.ssh_key || resolvedSSHConfig?.privateKey,
         passphrase: source.ssh_passphrase,
-        proxyJump: source.ssh_proxy_jump || resolvedSSHConfig?.proxyJump,
+        proxyJump,
+        resolvedJumpHosts,
         keepaliveInterval: source.ssh_keepalive_interval,
         keepaliveCountMax: source.ssh_keepalive_count_max
       };
@@ -1808,6 +1903,12 @@ var ConnectorManager = class {
     if (source.timezone) {
       config.timezone = source.timezone;
     }
+    if (source.charset) {
+      config.charset = source.charset;
+    }
+    if (source.collation) {
+      config.collation = source.collation;
+    }
     await connector.connect(actualDSN, source.init_script, config);
     this.connectors.set(sourceId, connector);
     if (!this.sourceIds.includes(sourceId)) {