@stacksjs/database 0.70.106 → 0.70.107

package/dist/migrations.js

@@ -537,16 +537,76 @@ ${readFileSync(join(migrationsDir, f), "utf8")}`;
   }
   return written;
 }
+function normalizeCreateStatements(sqlStatements) {
+  const creates = [], constraints = [], passthrough = [];
+  for (const raw of sqlStatements) {
+    const statement = raw.trim();
+    if (!statement)
+      continue;
+    const create = statement.match(/^CREATE\s+TABLE\s+(?:IF\s+NOT\s+EXISTS\s+)?["`]?(\w+)["`]?/i);
+    if (create?.[1]) {
+      creates.push({ statement, table: create[1] });
+      continue;
+    }
+    const constraint = statement.match(/^ALTER\s+TABLE\s+["`]?(\w+)["`]?\s+ADD\s+CONSTRAINT\s+([\s\S]+?);?$/i);
+    if (constraint?.[1] && constraint[2]) {
+      const references = [...constraint[2].matchAll(/REFERENCES\s+["`]?(\w+)["`]?/gi)].flatMap((match) => match[1] ? [match[1]] : []);
+      constraints.push({ body: `CONSTRAINT ${constraint[2].replace(/;\s*$/, "")}`, references, statement, table: constraint[1] });
+      continue;
+    }
+    passthrough.push(statement);
+  }
+  if (creates.length === 0)
+    return sqlStatements.map((statement) => statement.trim()).filter(Boolean);
+  const createdTables = new Set(creates.map((create) => create.table)), createOrder = new Map(creates.map((create, index) => [create.table, index])), relevantConstraints = constraints.filter((constraint) => createdTables.has(constraint.table)), unrelatedConstraints = constraints.filter((constraint) => !createdTables.has(constraint.table)), dependencies = new Map(creates.map((create) => [
+    create.table,
+    new Set(relevantConstraints.filter((constraint) => constraint.table === create.table).flatMap((constraint) => constraint.references).filter((reference) => reference !== create.table && createdTables.has(reference)))
+  ])), sortTables = (ignoredEdges = new Set) => {
+    const remaining = new Set(createdTables), sorted = [];
+    while (remaining.size > 0) {
+      const ready = [...remaining].filter((table) => [...dependencies.get(table) ?? []].every((dependency) => {
+        return !remaining.has(dependency) || ignoredEdges.has(`${table}->${dependency}`);
+      })).sort((a, b) => (createOrder.get(a) ?? 0) - (createOrder.get(b) ?? 0));
+      if (ready.length === 0)
+        break;
+      for (const table of ready) {
+        remaining.delete(table);
+        sorted.push(table);
+      }
+    }
+    return sorted;
+  }, initiallySorted = sortTables(), cyclicTables = new Set([...createdTables].filter((table) => !initiallySorted.includes(table))), deferred = relevantConstraints.filter((constraint) => constraint.references.some((reference) => {
+    return reference !== constraint.table && cyclicTables.has(constraint.table) && cyclicTables.has(reference);
+  })), deferredStatements = new Set(deferred.map((constraint) => constraint.statement)), ignoredEdges = new Set(deferred.flatMap((constraint) => constraint.references.map((reference) => `${constraint.table}->${reference}`))), orderedTables = sortTables(ignoredEdges), byTable = new Map(creates.map((create) => [create.table, create]));
+  return [
+    ...orderedTables.map((table) => {
+      const create = byTable.get(table), inline = relevantConstraints.filter((constraint) => constraint.table === table && !deferredStatements.has(constraint.statement));
+      if (inline.length === 0)
+        return create.statement;
+      const closing = create.statement.lastIndexOf(")");
+      if (closing < 0)
+        return create.statement;
+      const before = create.statement.slice(0, closing).trimEnd(), after = create.statement.slice(closing);
+      return `${before},
+  ${inline.map((constraint) => constraint.body).join(`,
+  `)}
+${after}`;
+    }),
+    ...passthrough,
+    ...unrelatedConstraints.map((constraint) => constraint.statement),
+    ...deferred.map((constraint) => constraint.statement)
+  ];
+}
 export function groupGeneratedStatements(sqlStatements) {
-  const groups = new Map, push = (label, stmt) => {
+  const normalizedStatements = normalizeCreateStatements(sqlStatements), groups = new Map, push = (label, stmt) => {
     const list = groups.get(label) ?? [];
     list.push(stmt);
     groups.set(label, list);
-  }, createdTables = new Set(sqlStatements.flatMap((raw) => {
+  }, createdTables = new Set(normalizedStatements.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) {
+  for (const raw of normalizedStatements) {
     const stmt = raw.trim();
     if (!stmt)
       continue;
@@ -557,7 +617,8 @@ export function groupGeneratedStatements(sqlStatements) {
     }
     const alter = stmt.match(/^\s*ALTER\s+TABLE\s+["`]?(\w+)["`]?\s+(?:ADD\s+COLUMN\s+["`]?(\w+)["`]?|DROP\s+COLUMN\s+["`]?(\w+)["`]?|ADD\s+CONSTRAINT)/i);
     if (alter) {
-      push(`alter-${alter[1]}-${alter[2] || alter[3] || "constraint"}`, stmt);
+      const isCreateTimeConstraint = createdTables.has(alter[1]) && !alter[2] && !alter[3];
+      push(isCreateTimeConstraint ? "create-foreign-key-constraints" : `alter-${alter[1]}-${alter[2] || alter[3] || "constraint"}`, stmt);
       continue;
     }
     const idx = stmt.match(/^\s*CREATE\s+(?:UNIQUE\s+)?INDEX\s+(?:IF\s+NOT\s+EXISTS\s+)?["`]?(\w+)["`]?\s+ON\s+["`]?(\w+)["`]?/i), idxName = idx?.[1], idxTable = idx?.[2];

package/package.json

@@ -2,7 +2,7 @@
   "name": "@stacksjs/database",
   "type": "module",
   "sideEffects": false,
-  "version": "0.70.106",
+  "version": "0.70.107",
   "description": "The Stacks database integration.",
   "author": "Chris Breuer",
   "contributors": [
@@ -58,15 +58,15 @@
     "bun-query-builder": "^0.1.54"
   },
   "devDependencies": {
-    "@stacksjs/cli": "0.70.106",
-    "@stacksjs/config": "0.70.106",
-    "@stacksjs/logging": "0.70.106",
-    "@stacksjs/router": "0.70.106",
+    "@stacksjs/cli": "0.70.107",
+    "@stacksjs/config": "0.70.107",
+    "@stacksjs/logging": "0.70.107",
+    "@stacksjs/router": "0.70.107",
     "better-dx": "^0.2.16",
-    "@stacksjs/path": "0.70.106",
-    "@stacksjs/query-builder": "0.70.106",
-    "@stacksjs/storage": "0.70.106",
-    "@stacksjs/strings": "0.70.106",
-    "@stacksjs/utils": "0.70.106"
+    "@stacksjs/path": "0.70.107",
+    "@stacksjs/query-builder": "0.70.107",
+    "@stacksjs/storage": "0.70.107",
+    "@stacksjs/strings": "0.70.107",
+    "@stacksjs/utils": "0.70.107"
   }
 }