@stacksjs/database 0.70.93 → 0.70.94

package/dist/migrations.d.ts

@@ -43,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)
  */
@@ -63,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

@@ -535,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)
@@ -557,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.93",
+  "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.93",
-    "@stacksjs/config": "0.70.93",
-    "@stacksjs/logging": "0.70.93",
-    "@stacksjs/router": "0.70.93",
+    "@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.93",
-    "@stacksjs/query-builder": "0.70.93",
-    "@stacksjs/storage": "0.70.93",
-    "@stacksjs/strings": "0.70.93",
-    "@stacksjs/utils": "0.70.93"
+    "@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"
   }
 }