migraguard 0.10.1 → 0.10.2

package/dist/cli.js

@@ -519,6 +519,8 @@ var init_dsl = __esm({
 
 // src/db-mysql.ts
 var ADVISORY_LOCK_KEY = "migraguard-apply";
+var CONNECTION_TIMEOUT_MS = 1e4;
+var DDL_LOCK_TIMEOUT_SEC = 5;
 var CREATE_TABLE_SQL = `
 CREATE TABLE IF NOT EXISTS schema_migrations (
     id              BIGINT       AUTO_INCREMENT PRIMARY KEY,
@@ -558,21 +560,37 @@ var MigraguardDbMysql = class {
       port: this.config.connection.port,
       database: this.config.connection.database,
       user: this.config.connection.user,
-      password: this.config.connection.password
+      password: this.config.connection.password,
+      connectTimeout: CONNECTION_TIMEOUT_MS
     });
   }
   async close() {
     await this.connection?.end();
   }
   async ensureTable() {
-    await this.exec(CREATE_TABLE_SQL);
+    if (await this.tableHasAllColumns()) return;
+    await this.exec(`SET SESSION lock_wait_timeout = ${DDL_LOCK_TIMEOUT_SEC}`);
+    try {
+      await this.exec(CREATE_TABLE_SQL);
+      const rows = await this.queryRows(
+        `SELECT COLUMN_NAME FROM INFORMATION_SCHEMA.COLUMNS
+         WHERE TABLE_SCHEMA = DATABASE() AND TABLE_NAME = 'schema_migrations' AND COLUMN_NAME = 'tag'`
+      );
+      if (rows.length === 0) {
+        await this.exec(`ALTER TABLE schema_migrations ADD COLUMN tag VARCHAR(256) NULL`);
+      }
+    } finally {
+      await this.exec(`SET SESSION lock_wait_timeout = DEFAULT`);
+    }
+  }
+  async tableHasAllColumns() {
     const rows = await this.queryRows(
       `SELECT COLUMN_NAME FROM INFORMATION_SCHEMA.COLUMNS
-       WHERE TABLE_SCHEMA = DATABASE() AND TABLE_NAME = 'schema_migrations' AND COLUMN_NAME = 'tag'`
+       WHERE TABLE_SCHEMA = DATABASE() AND TABLE_NAME = 'schema_migrations'`
     );
-    if (rows.length === 0) {
-      await this.exec(`ALTER TABLE schema_migrations ADD COLUMN tag VARCHAR(256) NULL`);
-    }
+    if (rows.length === 0) return false;
+    const existing = new Set(rows.map((r) => r["COLUMN_NAME"]));
+    return ["migration_class", "phase", "group_name", "tag"].every((c) => existing.has(c));
   }
   async acquireAdvisoryLock() {
     await this.exec(`SELECT GET_LOCK(?, -1)`, [ADVISORY_LOCK_KEY]);
@@ -783,6 +801,10 @@ function createDb(config) {
       return new MigraguardDb(config);
   }
 }
+var CONNECTION_TIMEOUT_MS2 = 1e4;
+var DDL_LOCK_TIMEOUT = "5s";
+var DDL_STATEMENT_TIMEOUT = "10s";
+var REQUIRED_COLUMNS = ["migration_class", "phase", "group_name", "tag"];
 var MigraguardDb = class {
   client;
   constructor(config) {
@@ -791,7 +813,8 @@ var MigraguardDb = class {
       port: config.connection.port,
       database: config.connection.database,
       user: config.connection.user,
-      password: config.connection.password
+      password: config.connection.password,
+      connectionTimeoutMillis: CONNECTION_TIMEOUT_MS2
     });
   }
   async connect() {
@@ -801,8 +824,26 @@ var MigraguardDb = class {
     await this.client.end();
   }
   async ensureTable() {
-    await this.client.query(CREATE_TABLE_SQL3);
-    await this.client.query(ALTER_TABLE_SQL);
+    if (await this.tableHasAllColumns()) return;
+    await this.client.query(`SET lock_timeout = '${DDL_LOCK_TIMEOUT}'`);
+    await this.client.query(`SET statement_timeout = '${DDL_STATEMENT_TIMEOUT}'`);
+    try {
+      await this.client.query(CREATE_TABLE_SQL3);
+      await this.client.query(ALTER_TABLE_SQL);
+    } finally {
+      await this.client.query("RESET lock_timeout");
+      await this.client.query("RESET statement_timeout");
+    }
+  }
+  async tableHasAllColumns() {
+    const result = await this.client.query(
+      `SELECT column_name FROM information_schema.columns
+       WHERE table_name = 'schema_migrations'
+         AND table_schema = current_schema()`
+    );
+    if (result.rows.length === 0) return false;
+    const existing = new Set(result.rows.map((r) => r["column_name"]));
+    return REQUIRED_COLUMNS.every((c) => existing.has(c));
   }
   async acquireAdvisoryLock() {
     await this.client.query(`SELECT pg_advisory_lock(hashtext($1))`, [ADVISORY_LOCK_KEY2]);