orchid-orm 1.64.5 → 1.64.6

package/dist/migrations/index.js

@@ -2165,6 +2165,90 @@ const processTableChange = async (adapter, structureToAstCtx, dbStructure, domai
   }
 };
 
+const processRoles = async (ast, dbStructure, { verifying, internal: { roles } }) => {
+  if (!dbStructure.roles || !roles) return;
+  const codeRoles = roles.map(
+    (role) => ({
+      super: false,
+      inherit: false,
+      createRole: false,
+      createDb: false,
+      canLogin: false,
+      replication: false,
+      connLimit: -1,
+      bypassRls: false,
+      ...role
+    })
+  );
+  const found = /* @__PURE__ */ new Set();
+  const dropRoles = [];
+  for (const dbRole of dbStructure.roles) {
+    const codeRole = codeRoles.find(
+      (codeRole2) => dbRole.name === codeRole2.name
+    );
+    if (codeRole) {
+      found.add(dbRole.name);
+      if (!pqb.deepCompare(dbRole, codeRole)) {
+        ast.push({
+          type: "changeRole",
+          name: dbRole.name,
+          from: dbRole,
+          to: codeRole
+        });
+      }
+      continue;
+    }
+    dropRoles.push(dbRole);
+  }
+  for (const codeRole of codeRoles) {
+    if (found.has(codeRole.name)) continue;
+    if (dropRoles.length) {
+      const i = await promptCreateOrRename(
+        "table",
+        codeRole.name,
+        dropRoles.map((x) => x.name),
+        verifying
+      );
+      if (i) {
+        const dbRole = dropRoles[i - 1];
+        dropRoles.splice(i - 1, 1);
+        ast.push(makeRenameOrChangeAst(dbRole, codeRole));
+        continue;
+      }
+    }
+    ast.push({
+      type: "role",
+      action: "create",
+      ...codeRole
+    });
+  }
+  for (const dbRole of dropRoles) {
+    ast.push({
+      type: "role",
+      action: "drop",
+      ...dbRole
+    });
+  }
+};
+const makeRenameOrChangeAst = (dbRole, codeRole) => {
+  const { name: dbRoleName, ...dbRoleRest } = dbRole;
+  const { name: codeRoleName, ...codeRoleRest } = codeRole;
+  if (pqb.deepCompare(dbRoleRest, codeRoleRest) && dbRoleName !== codeRoleName) {
+    return {
+      type: "renameRole",
+      from: dbRoleName,
+      to: codeRoleName
+    };
+  } else {
+    return {
+      type: "changeRole",
+      name: dbRole.name,
+      from: dbRole,
+      to: codeRole
+    };
+  }
+};
+
 class PendingDbTypes {
   constructor() {
     this.set = /* @__PURE__ */ new Set();
@@ -2175,6 +2259,7 @@ class PendingDbTypes {
 }
 const composeMigration = async (adapter, config, ast, dbStructure, params) => {
   const { structureToAstCtx, currentSchema } = params;
+  await processRoles(ast, dbStructure, params);
   const domainsMap = rakeDb.makeDomainsMap(structureToAstCtx, dbStructure);
   await processSchemas(ast, dbStructure, params);
   processExtensions(ast, dbStructure, params);
@@ -2201,7 +2286,7 @@ const composeMigration = async (adapter, config, ast, dbStructure, params) => {
 };
 
 const rollbackErr = new Error("Rollback");
-const verifyMigration = async (adapter, config, migrationCode, generateMigrationParams) => {
+const verifyMigration = async (adapter, config, migrationCode, generateMigrationParams, roles) => {
   const migrationFn = new Function("change", migrationCode);
   let code;
   try {
@@ -2217,7 +2302,9 @@ const verifyMigration = async (adapter, config, migrationCode, generateMigration
       for (const changeFn of changeFns) {
         await changeFn(db, true);
       }
-      const dbStructure = await rakeDb.introspectDbSchema(trx);
+      const dbStructure = await rakeDb.introspectDbSchema(trx, {
+        roles
+      });
       generateMigrationParams.verifying = true;
       try {
         code = await composeMigration(
@@ -2540,7 +2627,17 @@ const report = (ast, config, currentSchema) => {
         break;
       }
       case "role":
+        code.push(
+          `${a.action === "create" ? green("+ create role") : red("- drop role")} ${a.name}`
+        );
+        break;
+      case "renameRole":
+        code.push(
+          `${yellow("~ rename role")} ${a.from} ${yellow("=>")} ${a.to}`
+        );
+        break;
       case "changeRole": {
+        code.push(`${yellow("~ change role")} ${a.name}`);
         break;
       }
       default:
@@ -2572,16 +2669,18 @@ const generate = async (adapters, config, args, afterPull) => {
   if (afterPull) {
     adapters = [afterPull.adapter];
   }
+  const db = await getDbFromConfig(config, dbPath);
+  const { columnTypes, internal } = db.$qb;
+  const rolesDbStructureParam = internal.roles ? internal.managedRolesSql ? { whereSql: internal.managedRolesSql } : pqb.emptyObject : void 0;
   const { dbStructure } = await migrateAndPullStructures(
     adapters,
     config,
+    rolesDbStructureParam,
     afterPull
   );
   const [adapter] = adapters;
   const adapterSchema = adapter.getSchema();
   const currentSchema = (typeof adapterSchema === "function" ? adapterSchema() : adapterSchema) ?? "public";
-  const db = await getDbFromConfig(config, dbPath);
-  const { columnTypes, internal } = db.$qb;
   const codeItems = await getActualItems(
     db,
     currentSchema,
@@ -2617,7 +2716,8 @@ const generate = async (adapters, config, args, afterPull) => {
       adapter,
       config,
       migrationCode,
-      generateMigrationParams
+      generateMigrationParams,
+      rolesDbStructureParam
     );
     if (result !== void 0) {
       throw new Error(
@@ -2675,7 +2775,7 @@ const getDbFromConfig = async (config, dbPath) => {
   }
   return db;
 };
-const migrateAndPullStructures = async (adapters, config, afterPull) => {
+const migrateAndPullStructures = async (adapters, config, roles, afterPull) => {
   if (afterPull) {
     return {
       dbStructure: {
@@ -2697,7 +2797,11 @@ const migrateAndPullStructures = async (adapters, config, afterPull) => {
     await rakeDb.migrate(adapter, config);
   }
   const dbStructures = await Promise.all(
-    adapters.map((adapter) => rakeDb.introspectDbSchema(adapter))
+    adapters.map(
+      (adapter) => rakeDb.introspectDbSchema(adapter, {
+        roles
+      })
+    )
   );
   const dbStructure = dbStructures[0];
   for (let i = 1; i < dbStructures.length; i++) {