rake-db 2.25.7 → 2.25.9

package/dist/index.js

@@ -2479,6 +2479,7 @@ const changeEnumValues = async (migration, enumName, fromValues, toValues) => {
 const recreateEnum = async (migration, { schema, name }, values, errorMessage) => {
   const defaultSchema = migration.adapter.schema;
   const quotedName = quoteTable(schema, name);
+  const relKinds = ["r", "m"];
   const { rows: tables } = await migration.adapter.query(
     `SELECT n.nspname AS "schema",
   c.relname AS "table",
@@ -2490,6 +2491,7 @@ JOIN pg_type t ON a.atttypid = t.oid AND t.typname = ${orchidCore.singleQuote(na
 JOIN pg_namespace tn ON tn.oid = t.typnamespace AND tn.nspname = ${orchidCore.singleQuote(
       schema ?? defaultSchema
     )}
+WHERE c.relkind IN (${relKinds.map((c) => `'${c}'`).join(", ")})
 GROUP BY n.nspname, c.relname`
   );
   const sql = tables.map(
@@ -4852,14 +4854,16 @@ const astToMigration = (currentSchema, config, asts) => {
       const item = items[i];
       let satisfied = true;
       for (const dep of item.deps) {
-        if (toBeAdded.has(dep) && !added.has(dep)) {
+        if (toBeAdded.has(dep) && !added.has(dep) && !item.add.has(dep)) {
           satisfied = false;
           break;
         }
       }
       if (satisfied) {
-        for (const key of item.drop) {
-          if (remainingDeps.has(key)) {
+        for (const dep of item.drop) {
+          const selfRef = item.deps.has(dep);
+          const depsLeft = remainingDeps.get(dep);
+          if (depsLeft && depsLeft > (selfRef ? 1 : 0)) {
             satisfied = false;
             break;
           }