@stacksjs/database 0.70.241 → 0.70.243

package/dist/migrations.d.ts

@@ -42,6 +42,20 @@ export declare function prepareMigrationModelsDir(): { modelsDir: string, skip:
  * applied while its first column had never been created.
  */
 export declare function sqlStatementsOf(content: string): string[];
+/**
+ * Make a Postgres `CREATE TYPE … AS ENUM` statement safe to run twice.
+ *
+ * `CREATE TYPE` has no `IF NOT EXISTS`, so a corpus containing one can only be
+ * applied to a database that has never seen it. Every other way a migration run
+ * can be interrupted - a partially recorded ledger, a schema restored from a
+ * dump, a database built before the ledger existed - leaves `buddy migrate`
+ * dead on the first enum it meets, with an error naming a type that is already
+ * exactly right.
+ *
+ * The guard is a `DO` block catching `duplicate_object`, which needs a
+ * dollar-quoted body - hence the splitter above having to understand one.
+ */
+export declare function guardPostgresEnumTypes(sql: string): string;
 export declare function preprocessSqliteMigrations(): void;
 /**
  * Public bootstrap entry point.

package/dist/migrations.js

@@ -96,9 +96,70 @@ export function prepareMigrationModelsDir() {
   };
 }
 export function sqlStatementsOf(content) {
-  return content.split(`
-`).map((line) => line.replace(/--.*$/, "")).join(`
-`).split(";").map((s) => s.trim()).filter((s) => s.length > 0);
+  const statements = [];
+  let current = "", quote = null, dollarTag = null;
+  for (let i = 0;i < content.length; i++) {
+    const char = content[i];
+    if (dollarTag) {
+      current += char;
+      if (char === "$" && content.startsWith(dollarTag, i)) {
+        current += content.slice(i + 1, i + dollarTag.length);
+        i += dollarTag.length - 1;
+        dollarTag = null;
+      }
+      continue;
+    }
+    if (quote) {
+      current += char;
+      if (quote === "single" && char === "'" || quote === "double" && char === '"')
+        quote = null;
+      continue;
+    }
+    if (char === "-" && content[i + 1] === "-") {
+      const newline = content.indexOf(`
+`, i);
+      if (newline === -1)
+        break;
+      i = newline - 1;
+      continue;
+    }
+    const dollar = char === "$" ? /^\$[A-Za-z_]*\$/.exec(content.slice(i)) : null;
+    if (dollar) {
+      dollarTag = dollar[0];
+      current += dollarTag;
+      i += dollarTag.length - 1;
+      continue;
+    }
+    if (char === "'") {
+      quote = "single";
+      current += char;
+      continue;
+    }
+    if (char === '"') {
+      quote = "double";
+      current += char;
+      continue;
+    }
+    if (char === ";") {
+      const trimmed = current.trim();
+      if (trimmed.length > 0)
+        statements.push(trimmed);
+      current = "";
+      continue;
+    }
+    current += char;
+  }
+  const trailing = current.trim();
+  if (trailing.length > 0)
+    statements.push(trailing);
+  return statements;
+}
+export function guardPostgresEnumTypes(sql) {
+  return sql.replace(/CREATE\s+TYPE\s+("?[\w.]+"?)\s+AS\s+ENUM\s*\(([^)]*)\)/gi, (match, name, members, offset, whole) => {
+    if (/\bBEGIN\s*$/i.test(whole.slice(Math.max(0, offset - 40), offset)))
+      return match;
+    return `DO $stacks$ BEGIN CREATE TYPE ${name} AS ENUM (${members}); EXCEPTION WHEN duplicate_object THEN null; END $stacks$`;
+  });
 }
 export function preprocessSqliteMigrations() {
   const migrationsDir = join(process.cwd(), "database", "migrations");
@@ -484,9 +545,9 @@ function makeMigrationsIdempotent() {
     } catch {
       continue;
     }
-    if (!/\bADD\s+(?:COLUMN|CONSTRAINT)\b/i.test(sql))
+    if (!(/\bADD\s+(?:COLUMN|CONSTRAINT)\b/i.test(sql) || /\bCREATE\s+TYPE\b/i.test(sql)))
       continue;
-    const next = idempotentSql(sql);
+    const next = guardPostgresEnumTypes(idempotentSql(sql));
     if (next !== sql)
       try {
         writeFileSync(p, next);
@@ -814,7 +875,7 @@ export function createMissingEnumTypes(dangling, plan) {
     if (!members?.length)
       continue;
     const literals = members.map((member) => `'${String(member).replaceAll("'", "''")}'`).join(", ");
-    statements.push(`DO $$ BEGIN CREATE TYPE "${name}" AS ENUM (${literals}); EXCEPTION WHEN duplicate_object THEN null; END $$;`);
+    statements.push(`${guardPostgresEnumTypes(`CREATE TYPE "${name}" AS ENUM (${literals})`)};`);
     defined.push(name);
   }
   return { statements, defined };

package/package.json

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