rake-db 2.30.3 → 2.30.6

package/dist/index.d.ts

@@ -176,6 +176,7 @@ interface IntrospectedStructure {
     domains: DbStructure.Domain[];
     collations: DbStructure.Collation[];
     roles?: DbStructure.Role[];
+    managedRolesSql?: string;
 }
 interface IntrospectDbStructureParams {
     roles?: {
@@ -184,7 +185,7 @@ interface IntrospectDbStructureParams {
 }
 declare function introspectDbSchema(db: AdapterBase, params?: IntrospectDbStructureParams): Promise<IntrospectedStructure>;
 
-type RakeDbAst = RakeDbAst.Table | RakeDbAst.ChangeTable | RakeDbAst.RenameType | RakeDbAst.Schema | RakeDbAst.RenameSchema | RakeDbAst.Extension | RakeDbAst.Enum | RakeDbAst.EnumValues | RakeDbAst.RenameEnumValues | RakeDbAst.ChangeEnumValues | RakeDbAst.Domain | RakeDbAst.Collation | RakeDbAst.Constraint | RakeDbAst.RenameTableItem | RakeDbAst.View | RakeDbAst.Role | RakeDbAst.ChangeRole;
+type RakeDbAst = RakeDbAst.Table | RakeDbAst.ChangeTable | RakeDbAst.RenameType | RakeDbAst.Schema | RakeDbAst.RenameSchema | RakeDbAst.Extension | RakeDbAst.Enum | RakeDbAst.EnumValues | RakeDbAst.RenameEnumValues | RakeDbAst.ChangeEnumValues | RakeDbAst.Domain | RakeDbAst.Collation | RakeDbAst.Constraint | RakeDbAst.RenameTableItem | RakeDbAst.View | RakeDbAst.Role | RakeDbAst.RenameRole | RakeDbAst.ChangeRole;
 declare namespace RakeDbAst {
     interface Table extends TableData {
         type: 'table';
@@ -379,6 +380,11 @@ declare namespace RakeDbAst {
         type: 'role';
         action: 'create' | 'drop';
     }
+    interface RenameRole {
+        type: 'renameRole';
+        from: string;
+        to: string;
+    }
     interface ChangeRole {
         type: 'changeRole';
         name: string;
@@ -1403,8 +1409,9 @@ declare class Migration<CT = unknown> {
      * @param constraintName - name of the constraint
      */
     constraintExists(constraintName: string): Promise<boolean>;
-    createRole(name: string, params: Partial<DbStructure.Role>): Promise<void>;
+    createRole(name: string, params?: Partial<DbStructure.Role>): Promise<void>;
     dropRole(name: string, params?: Partial<DbStructure.Role>): Promise<void>;
+    renameRole(from: string, to: string): Promise<void>;
     changeRole(name: string, params: {
         from?: Partial<DbStructure.Role>;
         to: Partial<DbStructure.Role>;

package/dist/index.js

@@ -1789,33 +1789,46 @@ const changeAstToQuery = ({ name, from, to }) => {
   const w = [];
   for (const key in to) {
     let value = to[key];
-    if (key !== "config") {
+    if (key !== "config" && key !== "name") {
       if (value instanceof Date) value = value.toISOString();
-      let other = from[key];
-      if (other instanceof Date) other = other.toISOString();
-      if (value !== other && key in serializers) {
-        w.push(serializers[key](value));
-      }
+      w.push(serializers[key](value));
     }
   }
   if (w.length) {
     queries.push(`ALTER ROLE "${name}" WITH ${w.join(" ")}`);
   }
-  const config = to.config;
-  if (config) {
-    const fromConfig = from.config ?? pqb.emptyObject;
-    for (const key in config) {
-      const value = config[key];
-      const other = fromConfig[key];
-      if (value !== other) {
-        queries.push(
-          `ALTER ROLE "${name}" ${value ? `SET ${key} = '${value}'` : `RESET ${key}`}`
-        );
-      }
+  if (to.config) {
+    for (const key in to.config) {
+      const value = to.config[key];
+      queries.push(
+        `ALTER ROLE "${name}" ${value ? `SET ${key} = '${value}'` : `RESET ${key}`}`
+      );
+    }
+  } else if (from.config) {
+    for (const key in from.config) {
+      queries.push(`ALTER ROLE "${name}" RESET ${key}`);
     }
   }
   return queries.join(";\n");
 };
+const renameRole = async (migration, up, from, to) => {
+  if (!up) {
+    const f = from;
+    from = to;
+    to = f;
+  }
+  const ast = makeRenameAst(from, to);
+  const sql = renameAstToQuery(ast);
+  if (sql) await migration.adapter.arrays(sql);
+};
+const makeRenameAst = (from, to) => ({
+  type: "renameRole",
+  from,
+  to
+});
+const renameAstToQuery = (ast) => {
+  return `ALTER ROLE "${ast.from}" RENAME TO "${ast.to}"`;
+};
 
 const createMigrationInterface = (tx, up, config) => {
   const adapter = Object.create(tx);
@@ -2706,6 +2719,9 @@ class Migration {
   dropRole(name, params) {
     return createOrDropRole(this, !this.up, name, params);
   }
+  renameRole(from, to) {
+    return renameRole(this, this.up, from, to);
+  }
   changeRole(name, params) {
     return changeRole(
       this,
@@ -4086,7 +4102,8 @@ const astToGenerateItem = (config, ast, currentSchema) => {
       break;
     }
     case "role":
-    case "changeRole": {
+    case "changeRole":
+    case "renameRole": {
       break;
     }
     default:
@@ -4671,19 +4688,24 @@ const astEncoders = {
     return code;
   },
   role(ast) {
-    const params = ast.action === "create" ? roleParams(ast) : void 0;
+    const params = roleParams(ast.name, ast);
     const arr = [
-      `await db.${ast.action}Role(${pqb.singleQuote(ast.name)}${params?.length ? ", {" : ");"}`
+      `await db.${ast.action}Role(${pqb.singleQuote(ast.name)}${params.length ? ", {" : ");"}`
     ];
-    if (params?.length) {
+    if (params.length) {
       arr.push(params);
       arr.push("});");
     }
     return arr;
   },
+  renameRole(ast) {
+    return `await db.renameRole(${pqb.singleQuote(ast.from)}, ${pqb.singleQuote(
+      ast.to
+    )});`;
+  },
   changeRole(ast) {
-    const from = roleParams(ast.from, ast.to);
-    const to = roleParams(ast.to, ast.from, true);
+    const from = roleParams(ast.name, ast.from, ast.to);
+    const to = roleParams(ast.name, ast.to, ast.from, true);
     return [
       `await db.changeRole(${pqb.singleQuote(ast.name)}, {`,
       [...from.length ? ["from: {", from, "},"] : [], "to: {", to, "},"],
@@ -4691,7 +4713,7 @@ const astEncoders = {
     ];
   }
 };
-const roleParams = (ast, compare, to) => {
+const roleParams = (name, ast, compare, to) => {
   const params = [];
   for (const key of [
     "name",
@@ -4706,7 +4728,7 @@ const roleParams = (ast, compare, to) => {
     "bypassRls",
     "config"
   ]) {
-    if (key === "name" && !to) continue;
+    if (key === "name" && (!to || ast.name === name)) continue;
     let value = ast[key];
     if (!compare && (!value || key === "connLimit" && value === -1)) {
       continue;
@@ -5130,18 +5152,19 @@ const collationsSql = (version) => `SELECT
 FROM pg_collation
 JOIN pg_namespace n on pg_collation.collnamespace = n.oid
 WHERE ${filterSchema("n.nspname")}`;
-const roleSql = (params) => `SELECT json_agg(json_build_object(
+const roleSql = (params) => `SELECT COALESCE(json_agg(json_build_object(
   'name', rolname,
   'super', rolsuper,
   'inherit', rolinherit,
   'createRole', rolcreaterole,
+  'createDb', rolcreatedb,
   'canLogin', rolcanlogin,
   'replication', rolreplication,
   'connLimit', rolconnlimit,
   'validUntil', rolvaliduntil,
   'bypassRls', rolbypassrls,
   'config', rolconfig
-)) FROM pg_roles WHERE ${params.whereSql ?? `name != 'postgres' AND name !~ '^pg_'`}`;
+)), '[]') FROM pg_roles WHERE ${params.whereSql ?? `rolname != 'postgres' AND rolname !~ '^pg_'`}`;
 const sql = (version, params) => `SELECT (${schemasSql}) AS "schemas", ${jsonAgg(
   tablesSql,
   "tables"
@@ -5245,7 +5268,9 @@ async function introspectDbSchema(db, params) {
   if (result.roles) {
     for (const role of result.roles) {
       nullsToUndefined(role);
-      if (role.validUntil) role.validUntil = new Date(role.validUntil);
+      if (role.validUntil) {
+        role.validUntil = role.validUntil === "infinity" ? void 0 : new Date(role.validUntil);
+      }
       if (role.config) {
         const arr = role.config;
         role.config = Object.fromEntries(