rake-db 2.30.0 → 2.30.1

package/dist/index.js

@@ -181,10 +181,6 @@ const promptText = ({
 };
 
 const getMaybeTransactionAdapter = (db) => "$getAdapter" in db ? db.$getAdapter() : db;
-const ensureTransaction = (db, fn) => {
-  const adapter = getMaybeTransactionAdapter(db);
-  return adapter.isInTransaction() ? fn(adapter) : adapter.transaction(fn);
-};
 const runSqlInSavePoint = async (db, sql, code) => {
   const adapter = getMaybeTransactionAdapter(db);
   try {
@@ -315,10 +311,12 @@ const makePopulateEnumQuery = (schema, item) => {
 const transaction = (adapter, config, fn) => {
   const searchPath = config.transactionSearchPath;
   return adapter.transaction(
-    fn,
     searchPath ? {
-      searchPath: typeof searchPath === "function" ? searchPath() : searchPath
-    } : void 0
+      locals: {
+        search_path: typeof searchPath === "function" ? searchPath() : searchPath
+      }
+    } : void 0,
+    fn
   );
 };
 const queryLock = (trx) => trx.query(`SELECT pg_advisory_xact_lock('${RAKE_DB_LOCK_KEY}')`);
@@ -792,7 +790,7 @@ const createTable = async (migration, up, tableName, first, second, third) => {
     shape = tableData = pqb.emptyObject;
   }
   const schema = migration.adapter.getSchema();
-  const ast = makeAst$2(
+  const ast = makeAst$3(
     schema,
     up,
     tableName,
@@ -822,7 +820,7 @@ const createTable = async (migration, up, tableName, first, second, third) => {
     }
   };
 };
-const makeAst$2 = (schema, up, tableName, shape, tableData, options, noPrimaryKey) => {
+const makeAst$3 = (schema, up, tableName, shape, tableData, options, noPrimaryKey) => {
   const shapePKeys = [];
   for (const key in shape) {
     const column = shape[key];
@@ -1172,7 +1170,7 @@ const changeTable = async (migration, up, tableName, options, fn) => {
   addOrDropChanges.length = 0;
   const changeData = fn?.(tableChanger) || {};
   const schema = migration.adapter.getSchema();
-  const ast = makeAst$1(
+  const ast = makeAst$2(
     schema,
     up,
     tableName,
@@ -1186,7 +1184,7 @@ const changeTable = async (migration, up, tableName, options, fn) => {
     query.then?.(result);
   }
 };
-const makeAst$1 = (schema, up, name, changeData, changeTableData2, options) => {
+const makeAst$2 = (schema, up, name, changeData, changeTableData2, options) => {
   const { comment } = options;
   const shape = {};
   const consumedChanges = {};
@@ -1638,11 +1636,11 @@ const renameColumnSql = (from, to) => {
 
 const createView = async (migration, up, name, options, sql) => {
   const schema = migration.adapter.getSchema();
-  const ast = makeAst(schema, up, name, options, sql);
-  const query = astToQuery(ast);
+  const ast = makeAst$1(schema, up, name, options, sql);
+  const query = astToQuery$1(ast);
   await migration.adapter.arrays(interpolateSqlValues(query));
 };
-const makeAst = (schema, up, fullName, options, sql) => {
+const makeAst$1 = (schema, up, fullName, options, sql) => {
   if (typeof sql === "string") {
     sql = pqb.raw({ raw: sql });
   }
@@ -1658,7 +1656,7 @@ const makeAst = (schema, up, fullName, options, sql) => {
     deps: []
   };
 };
-const astToQuery = (ast) => {
+const astToQuery$1 = (ast) => {
   const values = [];
   const sql = [];
   const { options } = ast;
@@ -1695,6 +1693,130 @@ const astToQuery = (ast) => {
   };
 };
 
+const serializers = {
+  super: (b) => `${b ? "" : "NO"}SUPERUSER`,
+  inherit: (b) => `${b ? "" : "NO"}INHERIT`,
+  createRole: (b) => `${b ? "" : "NO"}CREATEROLE`,
+  createDb: (b) => `${b ? "" : "NO"}CREATEDB`,
+  canLogin: (b) => `${b ? "" : "NO"}LOGIN`,
+  replication: (b) => `${b ? "" : "NO"}REPLICATION`,
+  bypassRls: (b) => `${b ? "" : "NO"}BYPASSRLS`,
+  connLimit: (value) => `CONNECTION LIMIT ${value === void 0 ? -1 : value}`,
+  validUntil: (value) => `VALID UNTIL '${value === void 0 ? "infinity" : value}'`
+};
+const createOrDropRole = async (migration, up, name, params) => {
+  const ast = makeAst(up, name, params);
+  const sql = astToQuery(ast);
+  await migration.adapter.arrays(sql);
+};
+const makeAst = (up, name, params) => {
+  return {
+    type: "role",
+    action: up ? "create" : "drop",
+    name,
+    super: false,
+    inherit: false,
+    createRole: false,
+    createDb: false,
+    canLogin: false,
+    replication: false,
+    connLimit: -1,
+    bypassRls: false,
+    ...params
+  };
+};
+const astToQuery = (ast) => {
+  const w = [];
+  if (ast.action !== "drop") {
+    for (const key in ast) {
+      if (key in serializers && (key !== "connLimit" || ast[key] !== -1)) {
+        let value = ast[key];
+        if (value instanceof Date) value = value.toISOString();
+        w.push(serializers[key](value));
+      }
+    }
+  }
+  let sql = `${ast.action.toUpperCase()} ROLE "${ast.name}"${w.length ? ` WITH ${w.join(" ")}` : ""}`;
+  if (ast.action !== "drop" && ast.config) {
+    for (const [key, value] of Object.entries(ast.config)) {
+      sql += `;
+ALTER ROLE "${ast.name}" SET ${key} = '${value}'`;
+    }
+  }
+  return sql;
+};
+const changeRole = async (migration, up, name, from, to) => {
+  if (!up) {
+    if (to.name) {
+      from = { ...from, name };
+      name = to.name;
+    }
+    const f = from;
+    from = to;
+    to = { ...f };
+    for (const key in from) {
+      if (!(key in to)) {
+        to[key] = void 0;
+      }
+    }
+    if (from.config) {
+      const config = to.config ?? (to.config = {});
+      for (const key in from.config) {
+        if (!(key in config)) {
+          config[key] = void 0;
+        }
+      }
+    }
+  }
+  const ast = makeChangeAst(name, from, to);
+  const sql = changeAstToQuery(ast);
+  if (sql) await migration.adapter.arrays(sql);
+};
+const makeChangeAst = (name, from, to) => {
+  return {
+    type: "changeRole",
+    name,
+    from,
+    to
+  };
+};
+const changeAstToQuery = ({ name, from, to }) => {
+  const queries = [];
+  if (to.name && to.name !== name) {
+    queries.push(`ALTER ROLE "${name}" RENAME TO "${to.name}"`);
+    name = to.name;
+  }
+  const w = [];
+  for (const key in to) {
+    let value = to[key];
+    if (key !== "config") {
+      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));
+      }
+    }
+  }
+  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}`}`
+        );
+      }
+    }
+  }
+  return queries.join(";\n");
+};
+
 const createMigrationInterface = (tx, up, config) => {
   const adapter = Object.create(tx);
   const { query, arrays } = adapter;
@@ -2578,6 +2700,21 @@ class Migration {
       values: [constraintName]
     });
   }
+  createRole(name, params) {
+    return createOrDropRole(this, this.up, name, params);
+  }
+  dropRole(name, params) {
+    return createOrDropRole(this, !this.up, name, params);
+  }
+  changeRole(name, params) {
+    return changeRole(
+      this,
+      this.up,
+      name,
+      params.from || pqb.emptyObject,
+      params.to
+    );
+  }
 }
 const wrapWithLog = async (log, text, values, fn) => {
   if (!log) {
@@ -3381,7 +3518,7 @@ async function renameMigrations(config, trx, versions, renameTo) {
 }
 
 const transactionIfSingle = (adapter, config, fn) => {
-  return !adapter.isInTransaction() && config.transaction === "single" ? transaction(adapter, config, fn) : fn(adapter);
+  return config.transaction === "single" ? transaction(adapter, config, fn) : fn(adapter);
 };
 function makeMigrateFn(up, defaultCount, fn) {
   return async (db, config, params) => {
@@ -3434,14 +3571,16 @@ const migrateAndClose = async (db, config, params) => {
   await migrate(adapter, config, params);
   await adapter.close();
 };
-const runMigration = async (db, migration) => {
-  await ensureTransaction(db, async (trx) => {
+async function runMigration(db, ...args) {
+  const [config, migration] = args.length === 1 ? [{}, args[0]] : [args[0], args[1]];
+  const adapter = getMaybeTransactionAdapter(db);
+  await transaction(adapter, config, async (trx) => {
     clearChanges();
     const changes = await getChanges({ load: migration });
-    const config = changes[0]?.config;
-    await applyMigration(trx, true, changes, config);
+    const config2 = changes[0]?.config;
+    await applyMigration(trx, true, changes, config2);
   });
-};
+}
 const rollback = makeMigrateFn(
   false,
   1,
@@ -3505,7 +3644,7 @@ const migrateOrRollback = async (trx, config, set, versions, count, up, redo2, f
   }
   let loggedAboutStarting = false;
   let migrations;
-  const migrationRunner = trx.isInTransaction() || config.transaction === "single" ? applyMigration : runMigrationInOwnTransaction;
+  const migrationRunner = config.transaction === "single" ? applyMigration : runMigrationInOwnTransaction;
   for (const file of set.migrations) {
     if (up && versionsMap[file.version] || !up && !versionsMap[file.version]) {
       continue;
@@ -3946,6 +4085,10 @@ const astToGenerateItem = (config, ast, currentSchema) => {
       deps.push(tableSchema, `${tableSchema}.${tableName}`);
       break;
     }
+    case "role":
+    case "changeRole": {
+      break;
+    }
     default:
       pqb.exhaustive(ast);
   }
@@ -4526,7 +4669,60 @@ const astEncoders = {
     }
     pqb.addCode(code, ");");
     return code;
+  },
+  role(ast) {
+    const params = ast.action === "create" ? roleParams(ast) : void 0;
+    const arr = [
+      `await db.${ast.action}Role(${pqb.singleQuote(ast.name)}${params?.length ? ", {" : ");"}`
+    ];
+    if (params?.length) {
+      arr.push(params);
+      arr.push("});");
+    }
+    return arr;
+  },
+  changeRole(ast) {
+    const from = roleParams(ast.from, ast.to);
+    const to = roleParams(ast.to, ast.from, true);
+    return [
+      `await db.changeRole(${pqb.singleQuote(ast.name)}, {`,
+      [...from.length ? ["from: {", from, "},"] : [], "to: {", to, "},"],
+      "});"
+    ];
+  }
+};
+const roleParams = (ast, compare, to) => {
+  const params = [];
+  for (const key of [
+    "name",
+    "super",
+    "inherit",
+    "createRole",
+    "createDb",
+    "canLogin",
+    "replication",
+    "connLimit",
+    "validUntil",
+    "bypassRls",
+    "config"
+  ]) {
+    if (key === "name" && !to) continue;
+    let value = ast[key];
+    if (!compare && (!value || key === "connLimit" && value === -1)) {
+      continue;
+    }
+    value = value instanceof Date ? `'${value.toISOString()}'` : key === "config" ? JSON.stringify(value) : typeof value === "string" ? pqb.singleQuote(value) : value;
+    if (compare) {
+      const a = value === -1 || value === false ? void 0 : value;
+      const other = compare[key];
+      const b = other === -1 || other === false ? void 0 : other;
+      if (a === b) {
+        continue;
+      }
+    }
+    params.push(`${key}: ${value},`);
   }
+  return params;
 };
 const isTimestamp = (column, type) => {
   if (!column) return false;
@@ -4934,7 +5130,19 @@ const collationsSql = (version) => `SELECT
 FROM pg_collation
 JOIN pg_namespace n on pg_collation.collnamespace = n.oid
 WHERE ${filterSchema("n.nspname")}`;
-const sql = (version) => `SELECT (${schemasSql}) AS "schemas", ${jsonAgg(
+const roleSql = (params) => `SELECT json_agg(json_build_object(
+  'name', rolname,
+  'super', rolsuper,
+  'inherit', rolinherit,
+  'createRole', rolcreaterole,
+  'canLogin', rolcanlogin,
+  'replication', rolreplication,
+  'connLimit', rolconnlimit,
+  'validUntil', rolvaliduntil,
+  'bypassRls', rolbypassrls,
+  'config', rolconfig
+)) FROM pg_roles WHERE ${params.whereSql ?? `name != 'postgres' AND name !~ '^pg_'`}`;
+const sql = (version, params) => `SELECT (${schemasSql}) AS "schemas", ${jsonAgg(
   tablesSql,
   "tables"
 )}, ${jsonAgg(viewsSql, "views")}, ${jsonAgg(
@@ -4949,13 +5157,13 @@ const sql = (version) => `SELECT (${schemasSql}) AS "schemas", ${jsonAgg(
 )}, ${jsonAgg(domainsSql, "domains")}, ${jsonAgg(
   collationsSql(version),
   "collations"
-)}`;
-async function introspectDbSchema(db) {
+)}${params?.roles ? `, (${roleSql(params.roles)}) AS "roles"` : ""}`;
+async function introspectDbSchema(db, params) {
   const {
     rows: [{ version: versionString }]
   } = await db.query("SELECT version()");
   const version = +versionString.match(/\d+/)[0];
-  const data = await db.query(sql(version));
+  const data = await db.query(sql(version, params));
   const result = data.rows[0];
   for (const domain of result.domains) {
     domain.checks = domain.checks?.filter((check) => check);
@@ -5034,6 +5242,26 @@ async function introspectDbSchema(db) {
   }
   result.indexes = indexes;
   result.excludes = excludes;
+  if (result.roles) {
+    for (const role of result.roles) {
+      nullsToUndefined(role);
+      if (role.validUntil) role.validUntil = new Date(role.validUntil);
+      if (role.config) {
+        const arr = role.config;
+        role.config = Object.fromEntries(
+          arr.map((item) => {
+            const i = item.indexOf("=");
+            const key = item.slice(0, i);
+            const value = item.slice(i + 1);
+            return [
+              key,
+              value[0] === '"' ? value.slice(1, -1).replaceAll('""', '"') : value
+            ];
+          })
+        );
+      }
+    }
+  }
   return result;
 }
 const nullsToUndefined = (obj) => {
@@ -5132,6 +5360,15 @@ const structureToAst = async (ctx, adapter, config) => {
   for (const view of data.views) {
     ast.push(viewToAst(ctx, data, domains, view));
   }
+  if (data.roles) {
+    for (const role of data.roles) {
+      ast.push({
+        type: "role",
+        action: "create",
+        ...role
+      });
+    }
+  }
   return ast;
 };
 const makeDomainsMap = (ctx, data) => {
@@ -5298,7 +5535,8 @@ const getDbStructureTableData = (data, { name, schemaName }) => {
     } : void 0,
     indexes: data.indexes.filter(filterFn),
     excludes: data.excludes.filter(filterFn),
-    constraints
+    constraints,
+    roles: data.roles
   };
 };
 const filterByTableSchema = (tableName, schemaName) => (x) => x.tableName === tableName && x.schemaName === schemaName;