@event-driven-io/dumbo 0.12.5 → 0.12.7

package/dist/index.cjs

@@ -724,22 +724,33 @@ var runSQLMigrations = (pool, migrations, options) => pool.withTransaction(async
     connector: "PostgreSQL:pg"
     // TODO: This will need to change to support more connectors
   });
+  const result = { applied: [], skipped: [] };
   await databaseLock.withAcquire(
     execute,
     async () => {
       for (const migration of coreMigrations) {
         const sql2 = combineMigrations(migration);
-        await execute.command(rawSql(sql2));
+        await execute.command(rawSql(sql2), {
+          timeoutMs: options.migrationTimeoutMs
+        });
       }
       for (const migration of migrations) {
-        await runSQLMigration(execute, migration);
+        const wasApplied = await runSQLMigration(execute, migration, {
+          ignoreMigrationHashMismatch: _nullishCoalesce(options.ignoreMigrationHashMismatch, () => ( false)),
+          migrationTimeoutMs: options.migrationTimeoutMs
+        });
+        if (wasApplied) {
+          result.applied.push(migration);
+        } else {
+          result.skipped.push(migration);
+        }
       }
     },
     lockOptions
   );
-  return { success: options.dryRun ? false : true, result: void 0 };
+  return { success: options.dryRun ? false : true, result };
 });
-var runSQLMigration = async (execute, migration) => {
+var runSQLMigration = async (execute, migration, options) => {
   const sql2 = combineMigrations(migration);
   const sqlHash = await getMigrationHash(sql2);
   try {
@@ -747,13 +758,34 @@ var runSQLMigration = async (execute, migration) => {
       name: migration.name,
       sqlHash
     };
-    const wasMigrationApplied = await ensureMigrationWasNotAppliedYet(
+    const checkResult = await ensureMigrationWasNotAppliedYet(
       execute,
       newMigration
     );
-    if (wasMigrationApplied) return;
-    await execute.command(rawSql(sql2));
+    if (checkResult.exists === true) {
+      if (checkResult.hashesMatch === true) {
+        tracer.info("migration-already-applied", {
+          migrationName: migration.name
+        });
+        return false;
+      }
+      if (_optionalChain([options, 'optionalAccess', _12 => _12.ignoreMigrationHashMismatch]) !== true)
+        throw new Error(
+          `Migration hash mismatch for "${migration.name}". Aborting migration.`
+        );
+      tracer.warn("migration-hash-mismatch", {
+        migrationName: migration.name,
+        expectedHash: sqlHash,
+        actualHash: checkResult.hashFromDB
+      });
+      await updateMigrationHash(execute, newMigration);
+      return false;
+    }
+    await execute.command(rawSql(sql2), {
+      timeoutMs: _optionalChain([options, 'optionalAccess', _13 => _13.migrationTimeoutMs])
+    });
     await recordMigration(execute, newMigration);
+    return true;
   } catch (error) {
     tracer.error("migration-error", {
       migationName: migration.name,
@@ -773,23 +805,25 @@ var combineMigrations = (...migration) => migration.flatMap((m) => m.sqls).join(
 var ensureMigrationWasNotAppliedYet = async (execute, migration) => {
   const result = await singleOrNull(
     execute.query(
-      sql(`SELECT sql_hash FROM migrations WHERE name = %L`, migration.name)
+      sql(
+        `SELECT sql_hash as "sqlHash" FROM dmb_migrations WHERE name = %L`,
+        migration.name
+      )
     )
   );
-  if (result === null) return false;
-  const { sqlHash } = mapToCamelCase(result);
-  if (sqlHash !== migration.sqlHash) {
-    throw new Error(
-      `Migration hash mismatch for "${migration.name}". Aborting migration.`
-    );
-  }
-  return true;
+  if (result === null) return { exists: false };
+  const { sqlHash } = result;
+  return {
+    exists: true,
+    hashesMatch: sqlHash === migration.sqlHash,
+    hashFromDB: sqlHash
+  };
 };
 var recordMigration = async (execute, migration) => {
   await execute.command(
     sql(
       `
-      INSERT INTO migrations (name, sql_hash)
+      INSERT INTO dmb_migrations (name, sql_hash)
       VALUES (%L, %L)
       `,
       migration.name,
@@ -797,6 +831,19 @@ var recordMigration = async (execute, migration) => {
     )
   );
 };
+var updateMigrationHash = async (execute, migration) => {
+  await execute.command(
+    sql(
+      `
+      UPDATE dmb_migrations
+      SET sql_hash = %L, timestamp = NOW()
+      WHERE name = %L
+      `,
+      migration.sqlHash,
+      migration.name
+    )
+  );
+};
 
 // src/core/schema/schemaComponent.ts
 var schemaComponent = (type, migrationsOrComponents) => {
@@ -892,7 +939,7 @@ ${indent}  `
   )}
 ${indent}${COLOR_BRACKETS("}")}`;
 };
-var prettyJson = (obj, options) => formatJson(obj, 0, _optionalChain([options, 'optionalAccess', _12 => _12.handleMultiline]));
+var prettyJson = (obj, options) => formatJson(obj, 0, _optionalChain([options, 'optionalAccess', _14 => _14.handleMultiline]));
 
 // src/core/tracing/index.ts
 var tracer = () => {
@@ -975,7 +1022,7 @@ var _pgconnectionstring = require('pg-connection-string'); var _pgconnectionstri
 
 // src/postgres/core/schema/migrations.ts
 var migrationTableSQL = rawSql(`
-  CREATE TABLE IF NOT EXISTS migrations (
+  CREATE TABLE IF NOT EXISTS dmb_migrations (
     id SERIAL PRIMARY KEY,
     name VARCHAR(255) NOT NULL UNIQUE,
     application VARCHAR(255) NOT NULL DEFAULT 'default',
@@ -1002,7 +1049,9 @@ var runPostgreSQLMigrations = (pool, migrations, options) => runSQLMigrations(po
       lockId: MIGRATIONS_LOCK_ID
     }
   },
-  dryRun: _optionalChain([options, 'optionalAccess', _13 => _13.dryRun])
+  dryRun: _optionalChain([options, 'optionalAccess', _15 => _15.dryRun]),
+  ignoreMigrationHashMismatch: _optionalChain([options, 'optionalAccess', _16 => _16.ignoreMigrationHashMismatch]),
+  migrationTimeoutMs: _optionalChain([options, 'optionalAccess', _17 => _17.migrationTimeoutMs])
 });
 
 // src/postgres/core/schema/schema.ts
@@ -1142,8 +1191,8 @@ async function batch(client, sqlOrSqls, options) {
   const results = Array(
     sqls.length
   );
-  if (_optionalChain([options, 'optionalAccess', _14 => _14.timeoutMs])) {
-    await client.query(`SET statement_timeout = ${_optionalChain([options, 'optionalAccess', _15 => _15.timeoutMs])}`);
+  if (_optionalChain([options, 'optionalAccess', _18 => _18.timeoutMs])) {
+    await client.query(`SET statement_timeout = ${_optionalChain([options, 'optionalAccess', _19 => _19.timeoutMs])}`);
   }
   for (let i = 0; i < sqls.length; i++) {
     tracer.info("db:sql:query", { sql: sqls[i] });
@@ -1164,12 +1213,12 @@ var nodePostgresTransaction = (connection) => (getClient, options) => ({
   commit: async () => {
     const client = await getClient;
     await client.query("COMMIT");
-    if (_optionalChain([options, 'optionalAccess', _16 => _16.close])) await _optionalChain([options, 'optionalAccess', _17 => _17.close, 'call', _18 => _18(client)]);
+    if (_optionalChain([options, 'optionalAccess', _20 => _20.close])) await _optionalChain([options, 'optionalAccess', _21 => _21.close, 'call', _22 => _22(client)]);
   },
   rollback: async (error) => {
     const client = await getClient;
     await client.query("ROLLBACK");
-    if (_optionalChain([options, 'optionalAccess', _19 => _19.close])) await _optionalChain([options, 'optionalAccess', _20 => _20.close, 'call', _21 => _21(client, error)]);
+    if (_optionalChain([options, 'optionalAccess', _23 => _23.close])) await _optionalChain([options, 'optionalAccess', _24 => _24.close, 'call', _25 => _25(client, error)]);
   },
   execute: sqlExecutor(nodePostgresSQLExecutor(), {
     connect: () => getClient
@@ -1228,14 +1277,14 @@ var checkConnection = async (connectionString) => {
 
 var arePgTypesSet = false;
 var setNodePostgresTypeParser = (options) => {
-  if (arePgTypesSet && !_optionalChain([options, 'optionalAccess', _22 => _22.force])) return;
+  if (arePgTypesSet && !_optionalChain([options, 'optionalAccess', _26 => _26.force])) return;
   arePgTypesSet = true;
   _pg2.default.types.setTypeParser(20, (val) => BigInt(val));
   _pg2.default.types.setTypeParser(3802, (val) => JSONSerializer.deserialize(val));
   _pg2.default.types.setTypeParser(114, (val) => JSONSerializer.deserialize(val));
 };
 var setNodePostgresTypeRawParser = (options) => {
-  if (arePgTypesSet && !_optionalChain([options, 'optionalAccess', _23 => _23.force])) return;
+  if (arePgTypesSet && !_optionalChain([options, 'optionalAccess', _27 => _27.force])) return;
   arePgTypesSet = true;
   _pg2.default.types.setTypeParser(20, (val) => BigInt(val));
   _pg2.default.types.setTypeParser(3802, (val) => RawJSONSerializer.deserialize(val));