@zz1996/dbhub-dameng 0.1.7 → 1.2.5-dameng.621

package/dist/{mariadb-7F72IRB4.js → mariadb-MMC6WMEG.js}

@@ -1,19 +1,28 @@
 import {
-  extractAffectedRows,
-  parseQueryResults
-} from "./chunk-RTB262PR.js";
+  MissingDatabaseError,
+  getMySQLFamilyHealthCheck,
+  isTiDBVersion,
+  parseQueryResultSets,
+  requireDatabaseInDSN,
+  withReadOnlyTransaction
+} from "./chunk-4276LPPU.js";
+import "./chunk-FU2ZJE4E.js";
 import {
   quoteIdentifier
-} from "./chunk-IPK7BYBL.js";
+} from "./chunk-JFWX35TB.js";
 import {
-  SQLRowLimiter
-} from "./chunk-ZNQTMARG.js";
+  obfuscateDSNPassword
+} from "./chunk-3RJRH3CN.js";
+import {
+  SQLRowLimiter,
+  closeQuietly
+} from "./chunk-O3PEWKBB.js";
+import "./chunk-HDPZAIDL.js";
 import {
   ConnectorRegistry,
   SafeURL,
-  obfuscateDSNPassword,
   splitSQLStatements
-} from "./chunk-SQA2ISDE.js";
+} from "./chunk-2JL4KCP5.js";
 
 // src/connectors/mariadb/index.ts
 import * as mariadb from "mariadb";
@@ -32,11 +41,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 +60,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 +87,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 +114,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 +128,20 @@ var MariaDBConnector = class _MariaDBConnector {
     try {
       const connectionConfig = await this.dsnParser.parse(dsn, config);
       this.pool = mariadb.createPool(connectionConfig);
-      await this.pool.query("SELECT 1");
+      this.pool.on("error", (err) => {
+        console.error(
+          `MariaDB pool (source "${this.sourceId}"): background connection error, pool will retry:`,
+          err.message
+        );
+      });
+      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;
     }
@@ -313,6 +348,13 @@ var MariaDBConnector = class _MariaDBConnector {
       return null;
     }
   }
+  async getHealthCheck() {
+    if (!this.pool) {
+      throw new Error("Not connected to database");
+    }
+    const pool = this.pool;
+    return getMySQLFamilyHealthCheck((sql) => pool.query(sql));
+  }
   async getStoredProcedures(schema, routineType) {
     if (!this.pool) {
       throw new Error("Not connected to database");
@@ -466,48 +508,39 @@ 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;
-        }
-      } 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 {
+      return await withReadOnlyTransaction(
+        conn,
+        options.readonly,
+        this.supportsReadOnlyTransaction,
+        async () => {
+          const statements = splitSQLStatements(sql, "mariadb");
+          let processedSQL = sql;
+          let probes = [];
+          if (options.maxRows) {
+            const rewrites = statements.map(
+              (statement) => SQLRowLimiter.applyMaxRowsWithTruncationProbe(statement, options.maxRows, "mariadb")
+            );
+            probes = rewrites.map((rewrite) => rewrite.probeApplied);
+            processedSQL = rewrites.map((rewrite) => rewrite.sql).join("; ");
+            if (sql.trim().endsWith(";")) {
+              processedSQL += ";";
+            }
+          }
+          let results;
+          if (parameters && parameters.length > 0) {
+            results = await conn.query(processedSQL, parameters);
+          } else {
+            results = await conn.query(processedSQL);
+          }
+          const resultSets = parseQueryResultSets(results, statements);
+          if (resultSets.length === probes.length) {
+            resultSets.forEach(
+              (set, index) => SQLRowLimiter.flagTruncation(set, options.maxRows, probes[index])
+            );
+          }
+          return { resultSets };
         }
-      }
-      console.error("Error executing query:", error);
-      throw error;
+      );
     } finally {
       conn.release();
     }

package/dist/{mysql-A43SL7UM.js → mysql-TESH7KKV.js}

@@ -1,19 +1,29 @@
 import {
-  extractAffectedRows,
-  parseQueryResults
-} from "./chunk-RTB262PR.js";
+  MissingDatabaseError,
+  getMySQLFamilyHealthCheck,
+  isClientSideTimeout,
+  isTiDBVersion,
+  parseQueryResultSets,
+  requireDatabaseInDSN,
+  withReadOnlyTransaction
+} from "./chunk-4276LPPU.js";
+import "./chunk-FU2ZJE4E.js";
 import {
   quoteIdentifier
-} from "./chunk-IPK7BYBL.js";
+} from "./chunk-JFWX35TB.js";
 import {
-  SQLRowLimiter
-} from "./chunk-ZNQTMARG.js";
+  obfuscateDSNPassword
+} from "./chunk-3RJRH3CN.js";
+import {
+  SQLRowLimiter,
+  closeQuietly
+} from "./chunk-O3PEWKBB.js";
+import "./chunk-HDPZAIDL.js";
 import {
   ConnectorRegistry,
   SafeURL,
-  obfuscateDSNPassword,
   splitSQLStatements
-} from "./chunk-SQA2ISDE.js";
+} from "./chunk-2JL4KCP5.js";
 
 // src/connectors/mysql/index.ts
 import mysql from "mysql2/promise";
@@ -21,6 +31,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 +44,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 +74,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 +90,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)}`
       );
@@ -89,7 +109,7 @@ Expected: ${expectedFormat}`
     }
   }
 };
-var MySQLConnector = class _MySQLConnector {
+var _MySQLConnector = class _MySQLConnector {
   constructor() {
     this.id = "mysql";
     this.name = "MySQL";
@@ -97,6 +117,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 +134,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;
     }
@@ -319,6 +348,16 @@ var MySQLConnector = class _MySQLConnector {
       return null;
     }
   }
+  async getHealthCheck() {
+    if (!this.pool) {
+      throw new Error("Not connected to database");
+    }
+    const pool = this.pool;
+    return getMySQLFamilyHealthCheck(async (sql) => {
+      const [rows] = await pool.query(sql);
+      return rows;
+    });
+  }
   async getStoredProcedures(schema, routineType) {
     if (!this.pool) {
       throw new Error("Not connected to database");
@@ -471,55 +510,92 @@ var MySQLConnector = class _MySQLConnector {
       throw new Error("Not connected to database");
     }
     const conn = await this.pool.getConnection();
+    const threadId = conn.threadId;
+    let isConnectionPoisoned = false;
     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 += ";";
+      return await withReadOnlyTransaction(
+        conn,
+        options.readonly,
+        this.supportsReadOnlyTransaction,
+        async () => {
+          const statements = splitSQLStatements(sql, "mysql");
+          let processedSQL = sql;
+          let probes = [];
+          if (options.maxRows) {
+            const rewrites = statements.map(
+              (statement) => SQLRowLimiter.applyMaxRowsWithTruncationProbe(statement, options.maxRows, "mysql")
+            );
+            probes = rewrites.map((rewrite) => rewrite.probeApplied);
+            processedSQL = rewrites.map((rewrite) => rewrite.sql).join("; ");
+            if (sql.trim().endsWith(";")) {
+              processedSQL += ";";
+            }
+          }
+          let results;
+          if (parameters && parameters.length > 0) {
+            results = await conn.query({ sql: processedSQL, timeout: this.queryTimeoutMs }, parameters);
+          } else {
+            results = await conn.query({ sql: processedSQL, timeout: this.queryTimeoutMs });
+          }
+          const [firstResult] = results;
+          const resultSets = parseQueryResultSets(firstResult, statements);
+          if (resultSets.length === probes.length) {
+            resultSets.forEach(
+              (set, index) => SQLRowLimiter.flagTruncation(set, options.maxRows, probes[index])
+            );
+          }
+          return { resultSets };
         }
+      );
+    } catch (error) {
+      if (isClientSideTimeout(error)) {
+        isConnectionPoisoned = true;
+        await this.killQuery(threadId);
       }
-      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;
-        }
+      throw error;
+    } finally {
+      if (isConnectionPoisoned) {
+        conn.destroy();
       } else {
-        results = await conn.query({ sql: processedSQL, timeout: this.queryTimeoutMs });
+        conn.release();
       }
-      const [firstResult] = results;
-      const rows = parseQueryResults(firstResult);
-      const rowCount = extractAffectedRows(firstResult);
-      if (options.readonly) {
-        await conn.query("COMMIT");
-      }
-      return { rows, rowCount };
+    }
+  }
+  /**
+   * Best-effort server-side kill for a query abandoned by mysql2's client-side
+   * timeout. Uses a separate connection: the original connection's command
+   * queue is stuck behind the abandoned statement (see isClientSideTimeout)
+   * and cannot itself be used to send KILL QUERY.
+   *
+   * Bounded by its own short timeout, independent of the user's (possibly
+   * long or unset) query_timeout — KILL QUERY is metadata-only and should
+   * return almost immediately on a healthy server, so cleanup must not stall
+   * indefinitely if it doesn't.
+   */
+  async killQuery(threadId) {
+    if (!this.pool) return;
+    let killer;
+    let killerPoisoned = false;
+    try {
+      killer = await this.pool.getConnection();
+      await killer.query({ sql: `KILL QUERY ${threadId}`, timeout: _MySQLConnector.KILL_QUERY_TIMEOUT_MS });
     } catch (error) {
-      if (options.readonly) {
-        try {
-          await conn.query("ROLLBACK");
-        } catch {
+      killerPoisoned = isClientSideTimeout(error);
+    } finally {
+      if (killer) {
+        if (killerPoisoned) {
+          killer.destroy();
+        } else {
+          killer.release();
         }
       }
-      console.error("Error executing query:", error);
-      throw error;
-    } finally {
-      conn.release();
     }
   }
 };
+// Bounds the KILL QUERY cleanup call issued after a client-side query
+// timeout; see killQuery.
+_MySQLConnector.KILL_QUERY_TIMEOUT_MS = 5e3;
+var MySQLConnector = _MySQLConnector;
 var mysqlConnector = new MySQLConnector();
 ConnectorRegistry.register(mysqlConnector);
 export {