@stacksjs/database 0.70.243 → 0.70.245

package/dist/migrations.d.ts

@@ -55,6 +55,21 @@ export declare function sqlStatementsOf(content: string): string[];
  * The guard is a `DO` block catching `duplicate_object`, which needs a
  * dollar-quoted body - hence the splitter above having to understand one.
  */
+/**
+ * Put a `DROP DEFAULT` in front of every `ALTER COLUMN … TYPE …`.
+ *
+ * Postgres checks a column's existing default against the new type and refuses
+ * the whole statement when it cannot cast it - a `varchar` column defaulting to
+ * `'pending'` becoming an enum fails every time. The generator emits the right
+ * order now, but migration files are history: every corpus written before that
+ * still carries the old one, and re-running it fails on a database that has not
+ * caught up yet.
+ *
+ * Rewriting them here is the same bargain the rest of this pass makes. Adding
+ * the drop is safe whatever the column had, because the statement that follows
+ * either sets the new default or deliberately leaves none.
+ */
+export declare function orderPostgresColumnTypeChanges(sql: string): string;
 export declare function guardPostgresEnumTypes(sql: string): string;
 export declare function preprocessSqliteMigrations(): void;
 /**

package/dist/migrations.js

@@ -154,6 +154,21 @@ export function sqlStatementsOf(content) {
     statements.push(trailing);
   return statements;
 }
+export function orderPostgresColumnTypeChanges(sql) {
+  const lines = sql.split(`
+`), output = [];
+  for (const line of lines) {
+    const match = /^(\s*)ALTER\s+TABLE\s+("?[\w.]+"?)\s+ALTER\s+COLUMN\s+("?[\w]+"?)\s+TYPE\s/i.exec(line);
+    if (match) {
+      const [, indent, table, column] = match, drop = `${indent}ALTER TABLE ${table} ALTER COLUMN ${column} DROP DEFAULT;`;
+      if ((output.length > 0 ? output[output.length - 1].trim() : "") !== drop.trim())
+        output.push(drop);
+    }
+    output.push(line);
+  }
+  return output.join(`
+`);
+}
 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)))
@@ -545,9 +560,9 @@ function makeMigrationsIdempotent() {
     } catch {
       continue;
     }
-    if (!(/\bADD\s+(?:COLUMN|CONSTRAINT)\b/i.test(sql) || /\bCREATE\s+TYPE\b/i.test(sql)))
+    if (!(/\bADD\s+(?:COLUMN|CONSTRAINT)\b/i.test(sql) || /\bCREATE\s+TYPE\b/i.test(sql) || /\bALTER\s+COLUMN\b[^\n]*\bTYPE\b/i.test(sql)))
       continue;
-    const next = guardPostgresEnumTypes(idempotentSql(sql));
+    const next = orderPostgresColumnTypeChanges(guardPostgresEnumTypes(idempotentSql(sql)));
     if (next !== sql)
       try {
         writeFileSync(p, next);

package/package.json

@@ -2,7 +2,7 @@
   "name": "@stacksjs/database",
   "type": "module",
   "sideEffects": false,
-  "version": "0.70.243",
+  "version": "0.70.245",
   "description": "The Stacks database integration.",
   "author": "Chris Breuer",
   "contributors": [
@@ -54,19 +54,19 @@
   },
   "dependencies": {
     "@stacksjs/ts-validation": "^0.5.0",
-    "bun-query-builder": "^0.2.3",
+    "bun-query-builder": "^0.2.4",
     "dynamodb-tooling": "^0.3.2"
   },
   "devDependencies": {
-    "@stacksjs/cli": "0.70.243",
-    "@stacksjs/config": "0.70.243",
-    "@stacksjs/logging": "0.70.243",
-    "@stacksjs/router": "0.70.243",
+    "@stacksjs/cli": "0.70.245",
+    "@stacksjs/config": "0.70.245",
+    "@stacksjs/logging": "0.70.245",
+    "@stacksjs/router": "0.70.245",
     "better-dx": "^0.2.17",
-    "@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"
+    "@stacksjs/path": "0.70.245",
+    "@stacksjs/query-builder": "0.70.245",
+    "@stacksjs/storage": "0.70.245",
+    "@stacksjs/strings": "0.70.245",
+    "@stacksjs/utils": "0.70.245"
   }
 }