pipework 0.293.0 → 0.294.0

package/dist/data/migrate/run.d.ts

@@ -1,7 +1,9 @@
+import postgres from 'postgres';
 import type { Manifold } from '../../core/pipework.js';
 import type { ResolvedDatabase } from '../../core/config/index.js';
 import { type MigrationCheckResult } from './check.js';
 import { type MigrationNotice } from './apply.js';
+import { InvalidIndexRepairError, type InvalidIndex } from './invalid-indexes.js';
 import { type FrameworkTablesResult } from './provision-framework.js';
 export interface MigrateOptions {
     /** Called as each notice or warning a migration statement raises arrives. Issue #970. */
@@ -14,8 +16,16 @@ export interface MigrateResult {
     safetyCheck: MigrationCheckResult;
     /** No-transaction files picked up half applied and finished. Issue #378. */
     resumed: ResumedMigration[];
-    /** INVALID indexes a cut CREATE INDEX CONCURRENTLY left, dropped before the resumed statement reran. Issue #1003. */
+    /** INVALID indexes a cut CREATE INDEX CONCURRENTLY left, dropped before the statement that builds them reran. Issues #1003, #1005. */
     droppedInvalidIndexes: DroppedInvalidIndex[];
+    /**
+     * Every INVALID index this run met, with its case, what was done or must be
+     * done, and the outcome: (a) an owned index rebuilt, (b) a leftover of an owned
+     * index dropped, (c) anything else, untouched. Issue #1005.
+     */
+    invalidIndexes: InvalidIndex[];
+    /** Set when the catalog read for INVALID indexes failed, so none were checked. Issue #1005. */
+    invalidIndexReadError: string | null;
     /** Notices and warnings raised by migration statements, in arrival order. Issue #970. */
     notices: MigrateNotice[];
     /** Trace/audit tables, columns and day partitions this run provisioned. */
@@ -40,11 +50,23 @@ export interface MigrateNotice extends MigrationNotice {
     statement: number;
     statements: number;
 }
+export { InvalidIndexRepairError, type InvalidIndex };
 export declare class UnsafeMigrationError extends Error {
     readonly check: MigrationCheckResult;
     readonly name = "UnsafeMigrationError";
     constructor(check: MigrationCheckResult, message: string);
 }
 export declare function migrateAll(instance: Manifold, options?: MigrateOptions): Promise<MigrateResult[]>;
+/**
+ * The connection that holds the run lock. It must live as long as the run: the
+ * default `max_lifetime` would close it mid-run and release the lock, so both
+ * timeouts are off, as in src/test/setup.ts.
+ */
+export declare function openRunLock(url: string): ReturnType<typeof postgres>;
+/**
+ * Runs one database's migrations and index repairs under a session advisory
+ * lock held for the whole run. A second run at once waits for it, then finds
+ * nothing to apply. The lock dies with its connection. Issue #1005.
+ */
 export declare function migrateOne(instance: Manifold, dbConfig: ResolvedDatabase, options?: MigrateOptions): Promise<MigrateResult>;
 //# sourceMappingURL=run.d.ts.map

package/dist/data/migrate/run.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"run.d.ts","sourceRoot":"","sources":["../../../src/data/migrate/run.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAA;AACtD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAA;AAGlE,OAAO,EAAmB,KAAK,oBAAoB,EAAE,MAAM,YAAY,CAAA;AAEvE,OAAO,EAAmB,KAAK,eAAe,EAAE,MAAM,YAAY,CAAA;AAClE,OAAO,EAA4B,KAAK,qBAAqB,EAAE,MAAM,0BAA0B,CAAA;AAM/F,MAAM,WAAW,cAAc;IAC7B,yFAAyF;IACzF,QAAQ,CAAC,EAAE,CAAC,MAAM,EAAE,aAAa,KAAK,IAAI,CAAA;CAC3C;AAED,MAAM,WAAW,aAAa;IAC5B,QAAQ,EAAE,MAAM,CAAA;IAChB,aAAa,EAAE,MAAM,CAAA;IACrB,UAAU,EAAE,MAAM,EAAE,CAAA;IACpB,WAAW,EAAE,oBAAoB,CAAA;IACjC,4EAA4E;IAC5E,OAAO,EAAE,gBAAgB,EAAE,CAAA;IAC3B,qHAAqH;IACrH,qBAAqB,EAAE,mBAAmB,EAAE,CAAA;IAC5C,yFAAyF;IACzF,OAAO,EAAE,aAAa,EAAE,CAAA;IACxB,2EAA2E;IAC3E,eAAe,EAAE,qBAAqB,CAAA;CACvC;AAED,MAAM,WAAW,mBAAmB;IAClC,GAAG,EAAE,MAAM,CAAA;IACX,yCAAyC;IACzC,SAAS,EAAE,MAAM,CAAA;IACjB,gCAAgC;IAChC,KAAK,EAAE,MAAM,CAAA;CACd;AAED,MAAM,WAAW,gBAAgB;IAC/B,GAAG,EAAE,MAAM,CAAA;IACX,gDAAgD;IAChD,aAAa,EAAE,MAAM,CAAA;IACrB,eAAe,EAAE,MAAM,CAAA;CACxB;AAED,MAAM,WAAW,aAAc,SAAQ,eAAe;IACpD,GAAG,EAAE,MAAM,CAAA;IACX,yCAAyC;IACzC,SAAS,EAAE,MAAM,CAAA;IACjB,UAAU,EAAE,MAAM,CAAA;CACnB;AAED,qBAAa,oBAAqB,SAAQ,KAAK;aAG3B,KAAK,EAAE,oBAAoB;IAF7C,SAAkB,IAAI,0BAAyB;gBAE7B,KAAK,EAAE,oBAAoB,EAC3C,OAAO,EAAE,MAAM;CAIlB;AAED,wBAAsB,UAAU,CAAC,QAAQ,EAAE,QAAQ,EAAE,OAAO,GAAE,cAAmB,GAAG,OAAO,CAAC,aAAa,EAAE,CAAC,CAU3G;AAED,wBAAsB,UAAU,CAAC,QAAQ,EAAE,QAAQ,EAAE,QAAQ,EAAE,gBAAgB,EAAE,OAAO,GAAE,cAAmB,GAAG,OAAO,CAAC,aAAa,CAAC,CAyErI"}
+{"version":3,"file":"run.d.ts","sourceRoot":"","sources":["../../../src/data/migrate/run.ts"],"names":[],"mappings":"AAAA,OAAO,QAAQ,MAAM,UAAU,CAAA;AAE/B,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAA;AACtD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAA;AAGlE,OAAO,EAAmB,KAAK,oBAAoB,EAAE,MAAM,YAAY,CAAA;AAEvE,OAAO,EAAmB,KAAK,eAAe,EAAE,MAAM,YAAY,CAAA;AAClE,OAAO,EAAwB,uBAAuB,EAAE,KAAK,YAAY,EAAE,MAAM,sBAAsB,CAAA;AACvG,OAAO,EAA4B,KAAK,qBAAqB,EAAE,MAAM,0BAA0B,CAAA;AAM/F,MAAM,WAAW,cAAc;IAC7B,yFAAyF;IACzF,QAAQ,CAAC,EAAE,CAAC,MAAM,EAAE,aAAa,KAAK,IAAI,CAAA;CAC3C;AAED,MAAM,WAAW,aAAa;IAC5B,QAAQ,EAAE,MAAM,CAAA;IAChB,aAAa,EAAE,MAAM,CAAA;IACrB,UAAU,EAAE,MAAM,EAAE,CAAA;IACpB,WAAW,EAAE,oBAAoB,CAAA;IACjC,4EAA4E;IAC5E,OAAO,EAAE,gBAAgB,EAAE,CAAA;IAC3B,sIAAsI;IACtI,qBAAqB,EAAE,mBAAmB,EAAE,CAAA;IAC5C;;;;OAIG;IACH,cAAc,EAAE,YAAY,EAAE,CAAA;IAC9B,+FAA+F;IAC/F,qBAAqB,EAAE,MAAM,GAAG,IAAI,CAAA;IACpC,yFAAyF;IACzF,OAAO,EAAE,aAAa,EAAE,CAAA;IACxB,2EAA2E;IAC3E,eAAe,EAAE,qBAAqB,CAAA;CACvC;AAED,MAAM,WAAW,mBAAmB;IAClC,GAAG,EAAE,MAAM,CAAA;IACX,yCAAyC;IACzC,SAAS,EAAE,MAAM,CAAA;IACjB,gCAAgC;IAChC,KAAK,EAAE,MAAM,CAAA;CACd;AAED,MAAM,WAAW,gBAAgB;IAC/B,GAAG,EAAE,MAAM,CAAA;IACX,gDAAgD;IAChD,aAAa,EAAE,MAAM,CAAA;IACrB,eAAe,EAAE,MAAM,CAAA;CACxB;AAED,MAAM,WAAW,aAAc,SAAQ,eAAe;IACpD,GAAG,EAAE,MAAM,CAAA;IACX,yCAAyC;IACzC,SAAS,EAAE,MAAM,CAAA;IACjB,UAAU,EAAE,MAAM,CAAA;CACnB;AAED,OAAO,EAAE,uBAAuB,EAAE,KAAK,YAAY,EAAE,CAAA;AAErD,qBAAa,oBAAqB,SAAQ,KAAK;aAG3B,KAAK,EAAE,oBAAoB;IAF7C,SAAkB,IAAI,0BAAyB;gBAE7B,KAAK,EAAE,oBAAoB,EAC3C,OAAO,EAAE,MAAM;CAIlB;AAED,wBAAsB,UAAU,CAAC,QAAQ,EAAE,QAAQ,EAAE,OAAO,GAAE,cAAmB,GAAG,OAAO,CAAC,aAAa,EAAE,CAAC,CAU3G;AAKD;;;;GAIG;AACH,wBAAgB,WAAW,CAAC,GAAG,EAAE,MAAM,GAAG,UAAU,CAAC,OAAO,QAAQ,CAAC,CAEpE;AAED;;;;GAIG;AACH,wBAAsB,UAAU,CAAC,QAAQ,EAAE,QAAQ,EAAE,QAAQ,EAAE,gBAAgB,EAAE,OAAO,GAAE,cAAmB,GAAG,OAAO,CAAC,aAAa,CAAC,CAQrI"}

package/dist/data/migrate/run.js

@@ -1,10 +1,13 @@
+import postgres from 'postgres';
 import { sql } from '../query/index.js';
 import { quoteIdentifier } from '../db/identifiers.js';
 import { OWNER_LABEL_MIGRATE } from '../db/owner-labels.js';
 import { checkMigrations } from './check.js';
 import { readAppliedState } from './applied.js';
 import { applyMigrations } from './apply.js';
+import { repairInvalidIndexes, InvalidIndexRepairError } from './invalid-indexes.js';
 import { provisionFrameworkTables } from './provision-framework.js';
+export { InvalidIndexRepairError };
 export class UnsafeMigrationError extends Error {
     check;
     name = 'UnsafeMigrationError';
@@ -23,7 +26,32 @@ export async function migrateAll(instance, options = {}) {
     }
     return results;
 }
+/** One key per database: advisory locks are scoped to the database they are taken in. */
+const MIGRATE_LOCK_KEY = `hashtextextended('pipework.migrate', 0)`;
+/**
+ * The connection that holds the run lock. It must live as long as the run: the
+ * default `max_lifetime` would close it mid-run and release the lock, so both
+ * timeouts are off, as in src/test/setup.ts.
+ */
+export function openRunLock(url) {
+    return postgres(url, { max: 1, idle_timeout: 0, max_lifetime: 0, onnotice: () => { } });
+}
+/**
+ * Runs one database's migrations and index repairs under a session advisory
+ * lock held for the whole run. A second run at once waits for it, then finds
+ * nothing to apply. The lock dies with its connection. Issue #1005.
+ */
 export async function migrateOne(instance, dbConfig, options = {}) {
+    const lock = openRunLock(dbConfig.url);
+    try {
+        await lock.unsafe(`SELECT pg_advisory_lock(${MIGRATE_LOCK_KEY})`);
+        return await migrateLocked(instance, dbConfig, options);
+    }
+    finally {
+        await lock.end();
+    }
+}
+async function migrateLocked(instance, dbConfig, options) {
     const conn = instance.pool.getOrCreate(dbConfig, 'owner', OWNER_LABEL_MIGRATE);
     // Scope the safety gate to pending migrations only — hazards in already-applied
     // migrations are history, not a decision the operator still gets to make.
@@ -62,6 +90,14 @@ export async function migrateOne(instance, dbConfig, options = {}) {
             options.onNotice?.(full);
         },
     });
+    // After a run that finished without error only; a failing migration throws
+    // above and its rerun resumes and checks then. Throws when an owned index
+    // cannot be made valid.
+    const repaired = await repairInvalidIndexes({
+        migrationsFolder: dbConfig.migrations,
+        migrationsTable: dbConfig.migrationTable,
+        connectionUrl: dbConfig.url,
+    });
     // Trace and audit storage rides the default database; their partitioned
     // tables are kept out of generated migrations (#313), so migrate provisions them.
     const frameworkTables = await provisionFrameworkTables(conn.drizzle, instance.config.raw, {
@@ -77,6 +113,8 @@ export async function migrateOne(instance, dbConfig, options = {}) {
         safetyCheck,
         resumed,
         droppedInvalidIndexes,
+        invalidIndexes: repaired.indexes,
+        invalidIndexReadError: repaired.readError,
         notices,
         frameworkTables,
     };

package/dist/data/migrate/run.js.map

@@ -1 +1 @@
-{"version":3,"file":"run.js","sourceRoot":"","sources":["../../../src/data/migrate/run.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"run.js","sourceRoot":"","sources":["../../../src/data/migrate/run.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pipework",
-  "version": "0.293.0",
+  "version": "0.294.0",
   "description": "TypeScript framework for multi-tenant SaaS applications. PostgreSQL-only.",
   "type": "module",
   "license": "MIT",

package/src/cli/commands/migrate.ts

@@ -121,10 +121,25 @@ function reportResumed(result: MigrateResult): void {
   }
   for (const d of result.droppedInvalidIndexes) {
     warn(
-      `${result.database}: resumed "${d.tag}" at statement ${d.statement}; dropped INVALID index ${d.index} ` +
-      `left by the cut build.`,
+      `${result.database}: "${d.tag}" statement ${d.statement}: dropped INVALID index ${d.index} ` +
+      `left by a cut build before building it again.`,
     )
   }
+  for (const i of result.invalidIndexes) {
+    if (i.case === 'a' && i.outcome === 'repaired') {
+      warn(`${result.database}: rebuilt INVALID index ${i.index} with the statement from "${i.tag}".`)
+    } else if (i.case === 'b' && i.outcome === 'repaired') {
+      warn(`${result.database}: dropped INVALID leftover ${i.index}; ${i.reason}.`)
+    } else {
+      warn(
+        `${result.database}: INVALID index ${i.index} on ${i.table} was left alone: ${i.reason}. ` +
+        `Its owner can run: ${i.printed.join(' ; ')}`,
+      )
+    }
+  }
+  if (result.invalidIndexReadError !== null) {
+    warn(`${result.database}: could not check for INVALID indexes: ${result.invalidIndexReadError}`)
+  }
 }
 
 function reportFrameworkTables(result: MigrateResult): void {

package/src/data/migrate/apply.ts

@@ -200,15 +200,14 @@ export async function applyMigrations(options: ApplyOptions): Promise<number> {
         if (from > 0) options.onResume?.(migration.tag, from + 1, migration.statements.length)
 
         for (let i = from; i < migration.statements.length; i++) {
-          // Only the statement the cut interrupted (the first one run on a
-          // resume), and only its own index: a cut CREATE INDEX CONCURRENTLY
-          // leaves the name held by an INVALID index, which the plain form
-          // fails on ("already exists") and IF NOT EXISTS silently keeps.
-          // A valid index of that name is left alone. Issue #1003.
-          if (i === from && from > 0) {
-            const dropped = await dropInvalidIndexOf(client, migration.statements[i]!)
-            if (dropped !== null) options.onDropInvalidIndex?.(migration.tag, i + 1, dropped)
-          }
+          // Before every CREATE INDEX CONCURRENTLY, not only a resumed one: a
+          // cut build leaves the name held by an INVALID index, which the plain
+          // form fails on ("already exists") and IF NOT EXISTS silently keeps,
+          // and a cut in a file's first statement leaves no progress mark, so
+          // the rerun starts at 0. Only the statement's own index; a VALID
+          // index of that name is left alone. Issues #1003, #1005.
+          const dropped = await dropInvalidIndexOf(client, migration.statements[i]!)
+          if (dropped !== null) options.onDropInvalidIndex?.(migration.tag, i + 1, dropped)
           await inStatement(migration.tag, i + 1, migration.statements.length, () => client.unsafe(migration.statements[i]!))
           // Recorded AFTER the statement it describes: marking first would let
           // a death between the mark and the statement skip work silently,
@@ -222,6 +221,27 @@ export async function applyMigrations(options: ApplyOptions): Promise<number> {
           )
           options.onStatement?.(migration.tag, i + 1, migration.statements.length, applied + 1, migrations.length)
         }
+        // Never record a file applied while an index it built is INVALID.
+        // The progress mark goes back to that statement, so the rerun drops
+        // the index and builds it again. Issue #1005.
+        for (const [i, statement] of migration.statements.entries()) {
+          // Only builds the rerun can repair: `CREATE INDEX ... ON ONLY parent` is
+          // INVALID until every partition's index attaches, and no rerun fixes that.
+          const target = parseCreateIndexConcurrently(statement)
+          if (target === null) continue
+          if (await isInvalidIndex(client, target)) {
+            await client.unsafe(
+              `INSERT INTO ${progress} (tag, hash, statements_done) VALUES ($1, $2, $3)
+               ON CONFLICT (tag) DO UPDATE SET statements_done = EXCLUDED.statements_done, updated_at = now()`,
+              [migration.tag, migration.hash, i],
+            )
+            throw new Error(
+              `Migration "${migration.tag}" statement ${i + 1} built index ${target.index} on ${target.table}, ` +
+                `but the index is INVALID, so the migration is not recorded as applied. The next run drops it ` +
+                `and builds it again.`,
+            )
+          }
+        }
         await client.unsafe(
           `INSERT INTO ${table} ("hash", "created_at", "tag") VALUES ($1, $2, $3)`,
           [migration.hash, migration.folderMillis, migration.tag],
@@ -344,6 +364,10 @@ export function resumePoint(
 }
 
 const IDENT = String.raw`"(?:[^"]|"")+"|[A-Za-z_][A-Za-z0-9_$]*`
+const CREATE_INDEX_RE = new RegExp(
+  String.raw`^\s*CREATE\s+(?:UNIQUE\s+)?INDEX\s+(?:CONCURRENTLY\s+)?(?:IF\s+NOT\s+EXISTS\s+)?(${IDENT})\s+ON\s+(?:ONLY\s+)?((?:${IDENT})(?:\s*\.\s*(?:${IDENT}))?)`,
+  'i',
+)
 const CREATE_INDEX_CONCURRENTLY_RE = new RegExp(
   String.raw`^\s*CREATE\s+(?:UNIQUE\s+)?INDEX\s+CONCURRENTLY\s+(?:IF\s+NOT\s+EXISTS\s+)?(${IDENT})\s+ON\s+(?:ONLY\s+)?((?:${IDENT})(?:\s*\.\s*(?:${IDENT}))?)`,
   'i',
@@ -364,6 +388,26 @@ export function parseCreateIndexConcurrently(statement: string): { index: string
   return { index: unquoteIdent(match[1]!), table: match[2]! }
 }
 
+/**
+ * Like `parseCreateIndexConcurrently`, for a CREATE [UNIQUE] INDEX with or
+ * without CONCURRENTLY. Null for any other statement or an unnamed index.
+ */
+export function parseCreateIndex(statement: string): { index: string; table: string } | null {
+  const match = CREATE_INDEX_RE.exec(stripComments(statement))
+  if (match === null) return null
+  return { index: unquoteIdent(match[1]!), table: match[2]! }
+}
+
+/** True when an index of this name on this table exists and is INVALID. */
+async function isInvalidIndex(client: Sql, target: { index: string; table: string }): Promise<boolean> {
+  const found = await client.unsafe<{ one: number }[]>(
+    `SELECT 1 AS one FROM pg_index i JOIN pg_class c ON c.oid = i.indexrelid
+      WHERE c.relname = $1 AND NOT i.indisvalid AND i.indrelid = to_regclass($2)`,
+    [target.index, target.table],
+  )
+  return found.length > 0
+}
+
 /**
  * Drop the INVALID index a cut CREATE INDEX CONCURRENTLY left under the name
  * this statement is about to create, on the statement's own table. Returns the

package/src/data/migrate/index.ts

@@ -1,4 +1,4 @@
-export { migrateAll, migrateOne, UnsafeMigrationError, type MigrateResult, type MigrateOptions } from './run.js'
+export { migrateAll, migrateOne, UnsafeMigrationError, InvalidIndexRepairError, type InvalidIndex, type MigrateResult, type MigrateOptions } from './run.js'
 export { checkMigrations, formatCheckResult, type MigrationCheckResult, type FileHazards, type MigrationHazard, type Severity } from './check.js'
 export { hasPragma, PRAGMA_FOR, type PragmaKind } from './pragma.js'
 export { readAppliedState, type AppliedState } from './applied.js'

package/src/data/migrate/invalid-indexes.ts

@@ -0,0 +1,296 @@
+import postgres, { type Sql } from 'postgres'
+import { stripComments } from './statements.js'
+import { parseCreateIndex, readMigrations } from './apply.js'
+
+/**
+ * What migrate does with an INVALID index met in a database it migrated.
+ * Issue #1005.
+ *
+ * - `a`: an index a migration owns. Dropped and rebuilt with the migration's
+ *   own CREATE statement.
+ * - `b`: a `_ccnew` / `_ccold` leftover of an owned index whose counterpart is
+ *   VALID. Dropped.
+ * - `c`: anything else. Nothing is touched; the statements to run are printed.
+ */
+export interface InvalidIndex {
+  case: 'a' | 'b' | 'c'
+  /** Schema-qualified, quoted. */
+  index: string
+  /** Schema-qualified, quoted. */
+  table: string
+  /** What migrate did: rebuilt (a), dropped the leftover (b), or nothing (c). */
+  action: 'rebuilt' | 'dropped' | 'none'
+  outcome: 'repaired' | 'failed' | 'warned'
+  /** For (a): the tag of the migration whose CREATE was rerun. */
+  tag?: string
+  /** For (a): the statement rerun. */
+  statement?: string
+  /** For (c) and a failed (a): the statements its owner can run. */
+  printed: string[]
+  /** Why migrate left it alone, or what failed. */
+  reason?: string
+}
+
+export interface InvalidIndexReport {
+  indexes: InvalidIndex[]
+  /** Set when the catalog read failed; nothing was checked. */
+  readError: string | null
+}
+
+export class InvalidIndexRepairError extends Error {
+  override readonly name = 'InvalidIndexRepairError'
+  constructor(
+    public readonly indexes: InvalidIndex[],
+    message: string,
+  ) {
+    super(message)
+  }
+}
+
+export interface RepairOptions {
+  migrationsFolder: string
+  migrationsTable: string
+  connectionUrl: string
+}
+
+const LOCK_TIMEOUT = '30s'
+const LEFTOVER_RE = /_cc(?:new|old)\d*$/
+const IDENT = String.raw`"(?:[^"]|"")+"|[A-Za-z_][A-Za-z0-9_$]*`
+const DROP_INDEX_RE = new RegExp(
+  String.raw`^\s*DROP\s+INDEX\s+(?:CONCURRENTLY\s+)?(?:IF\s+EXISTS\s+)?((?:(?:${IDENT})(?:\s*\.\s*(?:${IDENT}))?\s*,?\s*)+)`,
+  'i',
+)
+
+interface Row {
+  oid: string
+  tableOid: string
+  schema: string
+  name: string
+  tableSchema: string
+  table: string
+  def: string
+}
+
+interface Owner {
+  tag: string
+  statement: string
+}
+
+function quoteIdent(name: string): string {
+  return `"${name.replace(/"/g, '""')}"`
+}
+
+function unquoteIdent(token: string): string {
+  return token.startsWith('"') ? token.slice(1, -1).replace(/""/g, '"') : token.toLowerCase()
+}
+
+/** The (schema?, name) pairs a DROP INDEX statement names; empty for any other statement. */
+function parseDropIndex(statement: string): { schema: string | null; name: string }[] {
+  const match = DROP_INDEX_RE.exec(stripComments(statement))
+  if (match === null) return []
+  const tokens = match[1]!.match(new RegExp(`(?:${IDENT})(?:\\s*\\.\\s*(?:${IDENT}))?`, 'g')) ?? []
+  return tokens.map((token) => {
+    const parts = token.match(new RegExp(IDENT, 'g'))!
+    return parts.length === 2
+      ? { schema: unquoteIdent(parts[0]!), name: unquoteIdent(parts[1]!) }
+      : { schema: null, name: unquoteIdent(parts[0]!) }
+  })
+}
+
+/** An index definition with its own name removed, so a leftover compares equal to its counterpart. */
+function nameless(def: string): string {
+  return def.replace(/^(CREATE (?:UNIQUE )?INDEX )(?:"(?:[^"]|"")+"|\S+)( ON )/, '$1$2')
+}
+
+const INVALID_INDEXES = `
+  SELECT i.indexrelid::text AS oid, i.indrelid::text AS "tableOid", n.nspname AS schema, c.relname AS name,
+         tn.nspname AS "tableSchema", t.relname AS "table", pg_get_indexdef(i.indexrelid) AS def
+    FROM pg_index i
+    JOIN pg_class c ON c.oid = i.indexrelid
+    JOIN pg_namespace n ON n.oid = c.relnamespace
+    JOIN pg_class t ON t.oid = i.indrelid
+    JOIN pg_namespace tn ON tn.oid = t.relnamespace
+   WHERE NOT i.indisvalid
+     AND c.relkind = 'i'
+     AND n.nspname <> 'information_schema' AND n.nspname NOT LIKE 'pg\\_%'
+     AND NOT EXISTS (SELECT 1 FROM pg_depend d
+                      WHERE d.classid = 'pg_class'::regclass AND d.objid = i.indexrelid AND d.deptype = 'e')
+     AND NOT EXISTS (SELECT 1 FROM pg_stat_progress_create_index p WHERE p.relid = i.indrelid)
+   ORDER BY n.nspname, c.relname`
+
+async function building(client: Sql, tableOid: string): Promise<boolean> {
+  const rows = await client.unsafe(
+    `SELECT 1 FROM pg_stat_progress_create_index WHERE relid = $1::oid`,
+    [tableOid],
+  )
+  return rows.length > 0
+}
+
+/** The applied migrations' CREATE INDEX statements that still stand, keyed by table oid and index name. */
+async function ownedIndexes(client: Sql, options: RepairOptions): Promise<Map<string, Owner>> {
+  const applied = new Set(
+    (await client.unsafe<{ tag: string }[]>(
+      `SELECT tag FROM ${quoteIdent(options.migrationsTable)} WHERE tag IS NOT NULL`,
+    )).map((r) => r.tag),
+  )
+  const owned = new Map<string, Owner & { schema: string }>()
+  for (const migration of readMigrations(options)) {
+    if (!applied.has(migration.tag)) continue
+    for (const statement of migration.statements) {
+      const create = parseCreateIndex(statement)
+      if (create !== null) {
+        const [table] = await client.unsafe<{ oid: string; schema: string }[]>(
+          `SELECT c.oid::text AS oid, n.nspname AS schema FROM pg_class c
+             JOIN pg_namespace n ON n.oid = c.relnamespace WHERE c.oid = to_regclass($1)`,
+          [create.table],
+        )
+        if (table !== undefined) owned.set(`${table.oid}:${create.index}`, { tag: migration.tag, statement, schema: table.schema })
+        continue
+      }
+      for (const dropped of parseDropIndex(statement)) {
+        for (const [key, owner] of owned) {
+          if (key.endsWith(`:${dropped.name}`) && (dropped.schema === null || dropped.schema === owner.schema)) {
+            owned.delete(key)
+          }
+        }
+      }
+    }
+  }
+  return owned
+}
+
+/**
+ * Repair the INVALID indexes the applied migrations made, and report the rest.
+ * Called once per database after `applyMigrations` finished without error,
+ * while the run's advisory lock is held. Throws `InvalidIndexRepairError` when
+ * an owned index cannot be made VALID. Issue #1005.
+ */
+export async function repairInvalidIndexes(options: RepairOptions): Promise<InvalidIndexReport> {
+  const client = postgres(options.connectionUrl, { max: 1, onnotice: () => {} })
+  try {
+    let rows: Row[]
+    let owned: Map<string, Owner>
+    try {
+      rows = await client.unsafe<Row[]>(INVALID_INDEXES)
+      owned = rows.length === 0 ? new Map() : await ownedIndexes(client, options)
+    } catch (err) {
+      return { indexes: [], readError: err instanceof Error ? err.message : String(err) }
+    }
+
+    const qualified = (schema: string, name: string): string => `${quoteIdent(schema)}.${quoteIdent(name)}`
+    const results: InvalidIndex[] = []
+    const failures: string[] = []
+    const ownedKey = (r: Row): string => `${r.tableOid}:${r.name}`
+    const printed = (r: Row, rebuild: boolean): string[] => [
+      ...(rebuild ? [`REINDEX INDEX CONCURRENTLY ${qualified(r.schema, r.name)}`] : []),
+      `DROP INDEX CONCURRENTLY ${qualified(r.schema, r.name)}`,
+    ]
+
+    // (a) owned: drop and rerun the migration's own CREATE.
+    const leftovers: Row[] = []
+    for (const row of rows) {
+      const owner = owned.get(ownedKey(row))
+      if (owner === undefined) {
+        if (LEFTOVER_RE.test(row.name)) leftovers.push(row)
+        else {
+          results.push({
+            case: 'c', index: qualified(row.schema, row.name), table: qualified(row.tableSchema, row.table),
+            action: 'none', outcome: 'warned', printed: printed(row, true),
+            reason: 'no applied migration owns this index',
+          })
+        }
+        continue
+      }
+      // Another session may have started a build on the table since the read.
+      if (await building(client, row.tableOid)) continue
+      const entry: InvalidIndex = {
+        case: 'a', index: qualified(row.schema, row.name), table: qualified(row.tableSchema, row.table),
+        action: 'rebuilt', outcome: 'repaired', tag: owner.tag, statement: owner.statement, printed: [],
+      }
+      try {
+        await client.unsafe(`SET lock_timeout = '${LOCK_TIMEOUT}'`)
+        try {
+          await client.unsafe(`DROP INDEX CONCURRENTLY IF EXISTS ${entry.index}`)
+        } finally {
+          await client.unsafe('RESET lock_timeout')
+        }
+        await client.unsafe(owner.statement)
+      } catch (err) {
+        const detail = err instanceof Error ? err.message : String(err)
+        const extra = (err as { detail?: unknown }).detail
+        entry.outcome = 'failed'
+        entry.reason = typeof extra === 'string' ? `${detail} (${extra})` : detail
+        entry.printed = printed(row, true)
+        failures.push(`${entry.index} (rerunning "${owner.tag}"): ${entry.reason}`)
+      }
+      results.push(entry)
+    }
+
+    // (b) / (c) leftovers, classified against the table's indexes as they stand after (a).
+    const byTable = new Map<string, { name: string; schema: string; valid: boolean; def: string }[]>()
+    for (const row of leftovers) {
+      if (!byTable.has(row.tableOid)) {
+        byTable.set(row.tableOid, await client.unsafe(
+          `SELECT c.relname AS name, n.nspname AS schema, i.indisvalid AS valid, pg_get_indexdef(i.indexrelid) AS def
+             FROM pg_index i JOIN pg_class c ON c.oid = i.indexrelid
+             JOIN pg_namespace n ON n.oid = c.relnamespace WHERE i.indrelid = $1::oid`,
+          [row.tableOid],
+        ))
+      }
+    }
+    for (const row of leftovers) {
+      const own = nameless(row.def)
+      const matches = byTable.get(row.tableOid)!.filter((o) => o.name !== row.name && nameless(o.def) === own)
+      const counterpart = matches.length === 1 ? matches[0]! : undefined
+      const base = { index: qualified(row.schema, row.name), table: qualified(row.tableSchema, row.table) }
+      if (counterpart === undefined) {
+        results.push({
+          case: 'c', ...base, action: 'none', outcome: 'warned', printed: printed(row, true),
+          reason: matches.length === 0
+            ? 'a leftover of an index build or rebuild, and no index on the table matches it'
+            : 'a leftover of an index build or rebuild, and more than one index on the table matches it',
+        })
+        continue
+      }
+      const counterpartOwned = owned.has(`${row.tableOid}:${counterpart.name}`)
+      if (!counterpartOwned || !counterpart.valid) {
+        results.push({
+          case: 'c', ...base, action: 'none', outcome: 'warned', printed: printed(row, !counterpart.valid),
+          reason: counterpartOwned
+            ? `a leftover of ${qualified(counterpart.schema, counterpart.name)}, which is not valid`
+            : `a leftover of ${qualified(counterpart.schema, counterpart.name)}, which no applied migration owns`,
+        })
+        continue
+      }
+      if (await building(client, row.tableOid)) continue
+      const entry: InvalidIndex = { case: 'b', ...base, action: 'dropped', outcome: 'repaired', printed: [],
+        reason: `a leftover of ${qualified(counterpart.schema, counterpart.name)}, which stays in use` }
+      try {
+        await client.unsafe(`SET lock_timeout = '${LOCK_TIMEOUT}'`)
+        try {
+          await client.unsafe(`DROP INDEX CONCURRENTLY IF EXISTS ${base.index}`)
+        } finally {
+          await client.unsafe('RESET lock_timeout')
+        }
+      } catch (err) {
+        entry.outcome = 'failed'
+        entry.action = 'none'
+        entry.reason = err instanceof Error ? err.message : String(err)
+        entry.printed = printed(row, false)
+      }
+      results.push(entry)
+    }
+
+    if (failures.length > 0) {
+      throw new InvalidIndexRepairError(
+        results,
+        `migrate could not make ${failures.length} INVALID ${failures.length === 1 ? 'index' : 'indexes'} ` +
+          `its migrations built valid:\n  ${failures.join('\n  ')}\n` +
+          `The next run drops each and builds it again; fix the cause first (for a UNIQUE index, the duplicate rows).`,
+      )
+    }
+    return { indexes: results, readError: null }
+  } finally {
+    await client.end()
+  }
+}