@stacksjs/database 0.70.92 → 0.70.94

package/dist/migrations.d.ts

@@ -30,9 +30,6 @@ export type { MigrationResult as MigrationResultType };
  *     directory clean and prevents future runs from re-discovering it.
  */
 export declare function preprocessSqliteMigrations(): void;
-/**
- * Run database migrations
- */
 export declare function runDatabaseMigration(): Promise<Result<string, Error>>;
 /**
  * Reset the database (drop all tables)
@@ -46,6 +43,13 @@ export declare function resetDatabase(): Promise<Result<string, Error>>;
  */
 export declare function previewPendingMigrations(options?: GenerateMigrationsOptions): Promise<MigrationOperation[]>;
 export declare function generateMigrations(options?: GenerateMigrationsOptions): Promise<Result<string, Error>>;
+/**
+ * Group generated SQL by the migration filename style the runner already
+ * uses for hand-written files: `create-<table>-table`,
+ * `alter-<table>-<col>`, `create-<index>-index-in-<table>`, or
+ * `drop-<table>-table`. Anything we can't match falls back to `auto-misc`.
+ */
+export declare function groupGeneratedStatements(sqlStatements: string[]): GeneratedGroup[];
 /**
  * Generate fresh migrations (full regeneration, ignoring previous state)
  */
@@ -66,6 +70,10 @@ export declare interface GenerateMigrationsOptions {
   applyRenames?: boolean
   fromDb?: boolean
 }
+declare interface GeneratedGroup {
+  label: string
+  statements: string[]
+}
 /**
  * Migration result type for compatibility
  */

package/dist/migrations.js

@@ -247,7 +247,7 @@ async function ensureDatabaseExists() {
 async function hideDisabledFeatureMigrations() {
   const hidden = [];
   try {
-    const { FEATURE_NAMES, migrationFeature } = await import("@stacksjs/buddy"), { feature: isFeatureEnabled } = await import("@stacksjs/config"), fs = await import("node:fs/promises"), migrationsDir = path.projectPath("database/migrations");
+    const { appModelClaimsTable, FEATURE_NAMES, migrationFeature, migrationTable } = await import("@stacksjs/buddy"), { feature: isFeatureEnabled } = await import("@stacksjs/config"), fs = await import("node:fs/promises"), migrationsDir = path.projectPath("database/migrations");
     if (!existsSync(migrationsDir))
       return hidden;
     const disabledFeatures = new Set(FEATURE_NAMES.filter((f) => !isFeatureEnabled(f)));
@@ -258,6 +258,9 @@ async function hideDisabledFeatureMigrations() {
       const owner = migrationFeature(file);
       if (!owner || !disabledFeatures.has(owner))
         continue;
+      const table = migrationTable(file);
+      if (table && appModelClaimsTable(table))
+        continue;
       const original = join(migrationsDir, file), hiddenPath = `${original}.disabled`;
       await fs.rename(original, hiddenPath);
       hidden.push({ original, hidden: hiddenPath, feature: owner });
@@ -301,6 +304,50 @@ async function writeMigrateMarker(appliedCount) {
     await fs.writeFile(file, body, "utf8");
   } catch {}
 }
+function idempotentSql(sql) {
+  const stmts = sql.split(";").map((s) => s.trim()).filter(Boolean);
+  if (stmts.length === 0)
+    return sql;
+  const out = [];
+  for (const raw of stmts) {
+    const stmt = raw.replace(/\bADD\s+COLUMN\s+(?!IF\s+NOT\s+EXISTS\b)/gi, "ADD COLUMN IF NOT EXISTS "), m = /^ALTER\s+TABLE\s+("?\w+"?)\s+ADD\s+CONSTRAINT\s+("?\w+"?)/i.exec(stmt);
+    if (m) {
+      const drop = `ALTER TABLE ${m[1]} DROP CONSTRAINT IF EXISTS ${m[2]}`;
+      if ((out[out.length - 1] ?? "").toUpperCase() !== drop.toUpperCase())
+        out.push(drop);
+    }
+    out.push(stmt);
+  }
+  return `${out.join(`;
+`)};
+`;
+}
+function makeMigrationsIdempotent() {
+  const migrationsDir = join(process.cwd(), "database", "migrations");
+  let files;
+  try {
+    files = readdirSync(migrationsDir).filter((f) => f.endsWith(".sql"));
+  } catch {
+    return;
+  }
+  for (const f of files) {
+    const p = join(migrationsDir, f);
+    let sql;
+    try {
+      sql = readFileSync(p, "utf8");
+    } catch {
+      continue;
+    }
+    if (!/\bADD\s+(?:COLUMN|CONSTRAINT)\b/i.test(sql))
+      continue;
+    const next = idempotentSql(sql);
+    if (next !== sql)
+      try {
+        writeFileSync(p, next);
+        log.debug(`[migration] made idempotent: ${f}`);
+      } catch {}
+  }
+}
 export async function runDatabaseMigration() {
   const startedAt = Date.now(), hidden = await hideDisabledFeatureMigrations();
   let lockHandle = null;
@@ -312,6 +359,8 @@ export async function runDatabaseMigration() {
     lockHandle = await acquireMigrationLock(dialect, lockDb);
     if (dialect === "sqlite")
       preprocessSqliteMigrations();
+    else if (dialect === "postgres")
+      makeMigrationsIdempotent();
     const modelsDir = path.userModelsPath(), appliedBefore = await countAppliedMigrations();
     log.debug(`[migration] Running migrations from: ${modelsDir}`);
     await qbExecuteMigration(modelsDir);
@@ -486,12 +535,15 @@ ${readFileSync(join(migrationsDir, f), "utf8")}`;
   }
   return written;
 }
-function groupGeneratedStatements(sqlStatements) {
+export function groupGeneratedStatements(sqlStatements) {
   const groups = new Map, push = (label, stmt) => {
     const list = groups.get(label) ?? [];
     list.push(stmt);
     groups.set(label, list);
-  };
+  }, createdTables = new Set(sqlStatements.flatMap((raw) => {
+    const match = raw.trim().match(/^\s*CREATE\s+TABLE\s+(?:IF\s+NOT\s+EXISTS\s+)?["`]?(\w+)["`]?/i);
+    return match?.[1] ? [match[1]] : [];
+  }));
   for (const raw of sqlStatements) {
     const stmt = raw.trim();
     if (!stmt)
@@ -508,7 +560,7 @@ function groupGeneratedStatements(sqlStatements) {
     }
     const idx = stmt.match(/^\s*CREATE\s+(?:UNIQUE\s+)?INDEX\s+(?:IF\s+NOT\s+EXISTS\s+)?["`]?(\w+)["`]?\s+ON\s+["`]?(\w+)["`]?/i);
     if (idx) {
-      push(`create-${idx[1]}-index-in-${idx[2]}`, stmt);
+      push(createdTables.has(idx[2]) ? `create-${idx[2]}-table` : `create-${idx[1]}-index-in-${idx[2]}`, stmt);
       continue;
     }
     const drop = stmt.match(/^\s*DROP\s+TABLE\s+(?:IF\s+EXISTS\s+)?["`]?(\w+)["`]?/i);

package/package.json

@@ -2,7 +2,7 @@
   "name": "@stacksjs/database",
   "type": "module",
   "sideEffects": false,
-  "version": "0.70.92",
+  "version": "0.70.94",
   "description": "The Stacks database integration.",
   "author": "Chris Breuer",
   "contributors": [
@@ -55,18 +55,18 @@
     "prepublishOnly": "bun run build"
   },
   "dependencies": {
-    "bun-query-builder": "^0.1.50"
+    "bun-query-builder": "^0.1.51"
   },
   "devDependencies": {
-    "@stacksjs/cli": "0.70.92",
-    "@stacksjs/config": "0.70.92",
-    "@stacksjs/logging": "0.70.92",
-    "@stacksjs/router": "0.70.92",
+    "@stacksjs/cli": "0.70.94",
+    "@stacksjs/config": "0.70.94",
+    "@stacksjs/logging": "0.70.94",
+    "@stacksjs/router": "0.70.94",
     "better-dx": "^0.2.16",
-    "@stacksjs/path": "0.70.92",
-    "@stacksjs/query-builder": "0.70.92",
-    "@stacksjs/storage": "0.70.92",
-    "@stacksjs/strings": "0.70.92",
-    "@stacksjs/utils": "0.70.92"
+    "@stacksjs/path": "0.70.94",
+    "@stacksjs/query-builder": "0.70.94",
+    "@stacksjs/storage": "0.70.94",
+    "@stacksjs/strings": "0.70.94",
+    "@stacksjs/utils": "0.70.94"
   }
 }