rake-db 2.29.9 → 2.30.0

package/dist/index.js

@@ -183,7 +183,7 @@ 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(void 0, fn);
+  return adapter.isInTransaction() ? fn(adapter) : adapter.transaction(fn);
 };
 const runSqlInSavePoint = async (db, sql, code) => {
   const adapter = getMaybeTransactionAdapter(db);
@@ -283,19 +283,16 @@ const quoteWithSchema = ({
   name
 }) => quoteTable(schema, name);
 const quoteTable = (schema, table) => schema ? `"${schema}"."${table}"` : `"${table}"`;
-const getSchemaAndTableFromName = (config, name) => {
+const getSchemaAndTableFromName = (schema, name) => {
   const i = name.indexOf(".");
-  return i !== -1 ? [name.slice(0, i), name.slice(i + 1)] : [
-    typeof config.schema === "function" ? config.schema() : config.schema,
-    name
-  ];
+  return i !== -1 ? [name.slice(0, i), name.slice(i + 1)] : [typeof schema === "function" ? schema() : schema, name];
 };
-const quoteNameFromString = (config, string) => {
-  return quoteTable(...getSchemaAndTableFromName(config, string));
+const quoteNameFromString = (schema, string) => {
+  return quoteTable(...getSchemaAndTableFromName(schema, string));
 };
-const quoteCustomType = (config, s) => {
-  const [schema, type] = getSchemaAndTableFromName(config, s);
-  return schema ? '"' + schema + '".' + type : type;
+const quoteCustomType = (schema, type) => {
+  const [s, t] = getSchemaAndTableFromName(schema, type);
+  return s ? '"' + s + '".' + t : t;
 };
 const quoteSchemaTable = (arg, excludeCurrentSchema) => {
   return pqb.singleQuote(concatSchemaAndName(arg, excludeCurrentSchema));
@@ -306,17 +303,23 @@ const concatSchemaAndName = ({
 }, excludeCurrentSchema) => {
   return schema && schema !== excludeCurrentSchema ? `${schema}.${name}` : name;
 };
-const makePopulateEnumQuery = (config, item) => {
-  const [schema, name] = getSchemaAndTableFromName(config, item.enumName);
+const makePopulateEnumQuery = (schema, item) => {
+  const [s, name] = getSchemaAndTableFromName(schema, item.enumName);
   return {
-    text: `SELECT unnest(enum_range(NULL::${quoteTable(schema, name)}))::text`,
+    text: `SELECT unnest(enum_range(NULL::${quoteTable(s, name)}))::text`,
     then(result) {
       item.options.push(...result.rows.map(([value]) => value));
     }
   };
 };
-const transaction = (adapter, fn) => {
-  return adapter.transaction(void 0, fn);
+const transaction = (adapter, config, fn) => {
+  const searchPath = config.transactionSearchPath;
+  return adapter.transaction(
+    fn,
+    searchPath ? {
+      searchPath: typeof searchPath === "function" ? searchPath() : searchPath
+    } : void 0
+  );
 };
 const queryLock = (trx) => trx.query(`SELECT pg_advisory_xact_lock('${RAKE_DB_LOCK_KEY}')`);
 const getCliParam = (args, name) => {
@@ -344,22 +347,22 @@ const getCurrentChanges = () => currentChanges;
 const pushChange = (change) => currentChanges.push(change);
 
 const versionToString = (config, version) => config.migrationId === "timestamp" ? `${version}` : `${version}`.padStart(config.migrationId.serial, "0");
-const columnTypeToSql = (config, item) => {
-  return item.data.isOfCustomType ? item instanceof pqb.DomainColumn ? quoteNameFromString(config, item.dataType) : quoteCustomType(config, item.toSQL()) : item.toSQL();
+const columnTypeToSql = (schema, item) => {
+  return item.data.isOfCustomType ? item instanceof pqb.DomainColumn ? quoteNameFromString(schema, item.dataType) : quoteCustomType(schema, item.toSQL()) : item.toSQL();
 };
 const getColumnName = (item, key, snakeCase) => {
   return item.data.name || (snakeCase ? pqb.toSnakeCase(key) : key);
 };
-const columnToSql = (config, name, item, values, hasMultiplePrimaryKeys, snakeCase) => {
-  const line = [`"${name}" ${columnTypeToSql(config, item)}`];
+const columnToSql = (schema, name, item, values, hasMultiplePrimaryKeys, snakeCase) => {
+  const line = [`"${name}" ${columnTypeToSql(schema, item)}`];
   if (item.data.compression) {
     line.push(`COMPRESSION ${item.data.compression}`);
   }
   if (item.data.collate) {
-    line.push(`COLLATE ${quoteNameFromString(config, item.data.collate)}`);
+    line.push(`COLLATE ${quoteNameFromString(schema, item.data.collate)}`);
   }
   if (item.data.identity) {
-    line.push(identityToSql(config, item.data.identity));
+    line.push(identityToSql(schema, item.data.identity));
   } else if (item.data.generated) {
     line.push(
       `GENERATED ALWAYS AS (${item.data.generated.toSQL({
@@ -393,7 +396,7 @@ const columnToSql = (config, name, item, values, hasMultiplePrimaryKeys, snakeCa
       }
       line.push(
         referencesToSql(
-          config,
+          schema,
           {
             columns: [name],
             ...foreignKey
@@ -417,11 +420,11 @@ const encodeColumnDefault = (def, values, column) => {
   }
   return null;
 };
-const identityToSql = (config, identity) => {
-  const options = sequenceOptionsToSql(config, identity);
+const identityToSql = (schema, identity) => {
+  const options = sequenceOptionsToSql(schema, identity);
   return `GENERATED ${identity.always ? "ALWAYS" : "BY DEFAULT"} AS IDENTITY${options ? ` (${options})` : ""}`;
 };
-const sequenceOptionsToSql = (config, item) => {
+const sequenceOptionsToSql = (schema, item) => {
   const line = [];
   if (item.dataType) line.push(`AS ${item.dataType}`);
   if (item.increment !== void 0) line.push(`INCREMENT BY ${item.increment}`);
@@ -431,8 +434,8 @@ const sequenceOptionsToSql = (config, item) => {
   if (item.cache !== void 0) line.push(`CACHE ${item.cache}`);
   if (item.cycle) line.push(`CYCLE`);
   if (item.ownedBy) {
-    const [schema, table] = getSchemaAndTableFromName(config, item.ownedBy);
-    line.push(`OWNED BY ${quoteTable(schema, table)}`);
+    const [s, table] = getSchemaAndTableFromName(schema, item.ownedBy);
+    line.push(`OWNED BY ${quoteTable(s, table)}`);
   }
   return line.join(" ");
 };
@@ -461,9 +464,9 @@ const addColumnComment = (comments, name, item) => {
     comments.push({ column: name, comment: item.data.comment });
   }
 };
-const getForeignKeyTable = (config, fnOrTable) => {
+const getForeignKeyTable = (schema, fnOrTable) => {
   if (typeof fnOrTable === "string") {
-    return getSchemaAndTableFromName(config, fnOrTable);
+    return getSchemaAndTableFromName(schema, fnOrTable);
   }
   const item = new (fnOrTable())();
   return [item.schema, item.table];
@@ -480,7 +483,7 @@ const getConstraintName = (table, constraint, snakeCase) => {
   if (constraint.identity) return `${table}_identity`;
   return `${table}_constraint`;
 };
-const constraintToSql = (config, { name }, up, constraint, values, snakeCase) => {
+const constraintToSql = (schema, { name }, up, constraint, values, snakeCase) => {
   const constraintName = constraint.name || getConstraintName(name, constraint, snakeCase);
   if (!up) {
     const { dropMode } = constraint;
@@ -488,7 +491,7 @@ const constraintToSql = (config, { name }, up, constraint, values, snakeCase) =>
   }
   const sql = [`CONSTRAINT "${constraintName}"`];
   if (constraint.references) {
-    sql.push(foreignKeyToSql(config, constraint.references, snakeCase));
+    sql.push(foreignKeyToSql(schema, constraint.references, snakeCase));
   }
   if (constraint.check) {
     sql.push(checkToSql(constraint.check, values));
@@ -498,15 +501,15 @@ const constraintToSql = (config, { name }, up, constraint, values, snakeCase) =>
 const checkToSql = (check, values) => {
   return `CHECK (${check.toSQL({ values })})`;
 };
-const foreignKeyToSql = (config, item, snakeCase) => {
+const foreignKeyToSql = (schema, item, snakeCase) => {
   return `FOREIGN KEY (${joinColumns(
     snakeCase ? item.columns.map(pqb.toSnakeCase) : item.columns
-  )}) ${referencesToSql(config, item, snakeCase)}`;
+  )}) ${referencesToSql(schema, item, snakeCase)}`;
 };
-const referencesToSql = (config, references, snakeCase) => {
-  const [schema, table] = getForeignKeyTable(config, references.fnOrTable);
+const referencesToSql = (schema, references, snakeCase) => {
+  const [s, table] = getForeignKeyTable(schema, references.fnOrTable);
   const sql = [
-    `REFERENCES ${quoteTable(schema, table)}(${joinColumns(
+    `REFERENCES ${quoteTable(s, table)}(${joinColumns(
       snakeCase ? references.foreignColumns.map(pqb.toSnakeCase) : references.foreignColumns
     )})`
   ];
@@ -555,7 +558,7 @@ const getIndexOrExcludeName = (table, columns, suffix) => makeConstraintName(
 );
 const getIndexName = (table, columns) => getIndexOrExcludeName(table, columns, "idx");
 const getExcludeName = (table, columns) => getIndexOrExcludeName(table, columns, "exclude");
-const indexesToQuery = (config, up, { schema, name: tableName }, indexes, snakeCase, language) => {
+const indexesToQuery = (up, { schema, name: tableName }, indexes, snakeCase, language) => {
   return indexes.map((index) => {
     const { options } = index;
     const { columns, include, name } = getIndexOrExcludeMainOptions(
@@ -584,7 +587,7 @@ const indexesToQuery = (config, up, { schema, name: tableName }, indexes, snakeC
     const columnsSql = columns.map((column) => {
       let sql2 = [
         "expression" in column ? `(${column.expression})` : `"${column.column}"`,
-        column.collate && `COLLATE ${quoteNameFromString(config, column.collate)}`,
+        column.collate && `COLLATE ${quoteNameFromString(schema, column.collate)}`,
         column.opclass,
         column.order
       ].filter((x) => !!x).join(" ");
@@ -628,7 +631,7 @@ const indexesToQuery = (config, up, { schema, name: tableName }, indexes, snakeC
     return { text: sql.join(" "), values };
   });
 };
-const excludesToQuery = (config, up, { schema, name: tableName }, excludes, snakeCase) => {
+const excludesToQuery = (up, { schema, name: tableName }, excludes, snakeCase) => {
   return excludes.map((exclude) => {
     const { options } = exclude;
     const { columns, include, name } = getIndexOrExcludeMainOptions(
@@ -648,7 +651,7 @@ const excludesToQuery = (config, up, { schema, name: tableName }, excludes, snak
     const columnList = columns.map(
       (column) => [
         "expression" in column ? `(${column.expression})` : `"${column.column}"`,
-        column.collate && `COLLATE ${quoteNameFromString(config, column.collate)}`,
+        column.collate && `COLLATE ${quoteNameFromString(schema, column.collate)}`,
         column.opclass,
         column.order,
         `WITH ${column.with}`
@@ -715,22 +718,23 @@ const cmpRawSql = (a, b) => {
   const bValues = JSON.stringify(values);
   return aSql === bSql && aValues === bValues;
 };
-const getMigrationsSchemaAndTable = (config) => {
+const getMigrationsSchemaAndTable = (adapter, config) => {
+  const schema = adapter.getSchema();
   const [tableSchema, table] = getSchemaAndTableFromName(
-    config,
+    schema,
     config.migrationsTable
   );
-  let schema = tableSchema;
-  if (!schema) {
-    schema = typeof config.schema === "function" ? config.schema() : config.schema;
-    if (schema === "public") {
-      schema = void 0;
+  let s = tableSchema;
+  if (!s) {
+    s = typeof schema === "function" ? schema() : schema;
+    if (s === "public") {
+      s = void 0;
     }
   }
-  return { schema, table };
+  return { schema: s, table };
 };
-const migrationsSchemaTableSql = (config) => {
-  const { schema, table } = getMigrationsSchemaAndTable(config);
+const migrationsSchemaTableSql = (adapter, config) => {
+  const { schema, table } = getMigrationsSchemaAndTable(adapter, config);
   return `${schema ? `"${schema}".` : ""}"${table}"`;
 };
 
@@ -787,8 +791,9 @@ const createTable = async (migration, up, tableName, first, second, third) => {
   } else {
     shape = tableData = pqb.emptyObject;
   }
+  const schema = migration.adapter.getSchema();
   const ast = makeAst$2(
-    migration.options,
+    schema,
     up,
     tableName,
     shape,
@@ -797,7 +802,7 @@ const createTable = async (migration, up, tableName, first, second, third) => {
     migration.options.noPrimaryKey
   );
   fn && validatePrimaryKey(ast);
-  const queries = astToQueries$1(migration.options, ast, snakeCase, language);
+  const queries = astToQueries$1(schema, ast, snakeCase, language);
   for (const { then, ...query } of queries) {
     const result = await migration.adapter.arrays(interpolateSqlValues(query));
     then?.(result);
@@ -817,7 +822,7 @@ const createTable = async (migration, up, tableName, first, second, third) => {
     }
   };
 };
-const makeAst$2 = (config, up, tableName, shape, tableData, options, noPrimaryKey) => {
+const makeAst$2 = (schema, up, tableName, shape, tableData, options, noPrimaryKey) => {
   const shapePKeys = [];
   for (const key in shape) {
     const column = shape[key];
@@ -826,11 +831,11 @@ const makeAst$2 = (config, up, tableName, shape, tableData, options, noPrimaryKe
     }
   }
   const { primaryKey } = tableData;
-  const [schema, table] = getSchemaAndTableFromName(config, tableName);
+  const [s, table] = getSchemaAndTableFromName(schema, tableName);
   return {
     type: "table",
     action: up ? "create" : "drop",
-    schema,
+    schema: s,
     name: table,
     shape,
     ...tableData,
@@ -866,13 +871,13 @@ You can suppress this error by setting { noPrimaryKey: true } after a table name
     }
   }
 };
-const astToQueries$1 = (config, ast, snakeCase, language) => {
+const astToQueries$1 = (schema, ast, snakeCase, language) => {
   const queries = [];
   const { shape } = ast;
   for (const key in shape) {
     const item = shape[key];
     if (!(item instanceof pqb.EnumColumn)) continue;
-    queries.push(makePopulateEnumQuery(config, item));
+    queries.push(makePopulateEnumQuery(schema, item));
   }
   if (ast.action === "drop") {
     queries.push({
@@ -894,7 +899,7 @@ const astToQueries$1 = (config, ast, snakeCase, language) => {
     lines.push(
       `
   ${columnToSql(
-        config,
+        schema,
         name,
         item,
         values,
@@ -918,7 +923,7 @@ const astToQueries$1 = (config, ast, snakeCase, language) => {
     lines.push(
       `
   ${constraintToSql(
-        config,
+        schema,
         ast,
         true,
         {
@@ -943,8 +948,8 @@ const astToQueries$1 = (config, ast, snakeCase, language) => {
 )`,
       values
     },
-    ...indexesToQuery(config, true, ast, indexes, snakeCase, language),
-    ...excludesToQuery(config, true, ast, excludes, snakeCase),
+    ...indexesToQuery(true, ast, indexes, snakeCase, language),
+    ...excludesToQuery(true, ast, excludes, snakeCase),
     ...commentsToQuery(ast, comments)
   );
   if (ast.comment) {
@@ -1166,21 +1171,22 @@ const changeTable = async (migration, up, tableName, options, fn) => {
   tableChanger[pqb.snakeCaseKey] = snakeCase;
   addOrDropChanges.length = 0;
   const changeData = fn?.(tableChanger) || {};
+  const schema = migration.adapter.getSchema();
   const ast = makeAst$1(
-    migration.options,
+    schema,
     up,
     tableName,
     changeData,
     changeTableData,
     options
   );
-  const queries = astToQueries(migration.options, ast, snakeCase, language);
+  const queries = astToQueries(schema, ast, snakeCase, language);
   for (const query of queries) {
     const result = await migration.adapter.arrays(interpolateSqlValues(query));
     query.then?.(result);
   }
 };
-const makeAst$1 = (config, up, name, changeData, changeTableData2, options) => {
+const makeAst$1 = (schema, up, name, changeData, changeTableData2, options) => {
   const { comment } = options;
   const shape = {};
   const consumedChanges = {};
@@ -1225,17 +1231,17 @@ const makeAst$1 = (config, up, name, changeData, changeTableData2, options) => {
     );
     shape[name2] = arr;
   }
-  const [schema, table] = getSchemaAndTableFromName(config, name);
+  const [s, table] = getSchemaAndTableFromName(schema, name);
   return {
     type: "changeTable",
-    schema,
+    schema: s,
     name: table,
     comment: comment ? up ? Array.isArray(comment) ? comment[1] : comment : Array.isArray(comment) ? comment[0] : null : void 0,
     shape,
     ...up ? changeTableData2 : { add: changeTableData2.drop, drop: changeTableData2.add }
   };
 };
-const astToQueries = (config, ast, snakeCase, language) => {
+const astToQueries = (schema, ast, snakeCase, language) => {
   const queries = [];
   if (ast.comment !== void 0) {
     queries.push({
@@ -1255,7 +1261,7 @@ const astToQueries = (config, ast, snakeCase, language) => {
     if (Array.isArray(item)) {
       for (const it of item) {
         handlePrerequisitesForTableItem(
-          config,
+          schema,
           key,
           it,
           queries,
@@ -1266,7 +1272,7 @@ const astToQueries = (config, ast, snakeCase, language) => {
       }
     } else {
       handlePrerequisitesForTableItem(
-        config,
+        schema,
         key,
         item,
         queries,
@@ -1305,7 +1311,7 @@ const astToQueries = (config, ast, snakeCase, language) => {
     if (Array.isArray(item)) {
       for (const it of item) {
         handleTableItemChange(
-          config,
+          schema,
           key,
           it,
           ast,
@@ -1325,7 +1331,7 @@ const astToQueries = (config, ast, snakeCase, language) => {
       }
     } else {
       handleTableItemChange(
-        config,
+        schema,
         key,
         item,
         ast,
@@ -1359,7 +1365,7 @@ const astToQueries = (config, ast, snakeCase, language) => {
     ...dropConstraints.map(
       (foreignKey) => `
  DROP ${constraintToSql(
-        config,
+        schema,
         ast,
         false,
         foreignKey,
@@ -1384,7 +1390,7 @@ const astToQueries = (config, ast, snakeCase, language) => {
     ...addConstraints.map(
       (foreignKey) => `
  ADD ${constraintToSql(
-        config,
+        schema,
         ast,
         true,
         foreignKey,
@@ -1406,14 +1412,10 @@ const astToQueries = (config, ast, snakeCase, language) => {
   if (alterTable.length) {
     queries.push(alterTableSql(tableName, alterTable, values));
   }
-  queries.push(
-    ...indexesToQuery(config, false, ast, dropIndexes, snakeCase, language)
-  );
-  queries.push(
-    ...indexesToQuery(config, true, ast, addIndexes, snakeCase, language)
-  );
-  queries.push(...excludesToQuery(config, false, ast, dropExcludes, snakeCase));
-  queries.push(...excludesToQuery(config, true, ast, addExcludes, snakeCase));
+  queries.push(...indexesToQuery(false, ast, dropIndexes, snakeCase, language));
+  queries.push(...indexesToQuery(true, ast, addIndexes, snakeCase, language));
+  queries.push(...excludesToQuery(false, ast, dropExcludes, snakeCase));
+  queries.push(...excludesToQuery(true, ast, addExcludes, snakeCase));
   queries.push(...commentsToQuery(ast, comments));
   return queries;
 };
@@ -1422,11 +1424,11 @@ const alterTableSql = (tableName, lines, values) => ({
   ${lines.join(",\n  ")}`,
   values
 });
-const handlePrerequisitesForTableItem = (config, key, item, queries, addPrimaryKeys, dropPrimaryKeys, snakeCase) => {
+const handlePrerequisitesForTableItem = (schema, key, item, queries, addPrimaryKeys, dropPrimaryKeys, snakeCase) => {
   if ("item" in item) {
     const { item: column } = item;
     if (column instanceof pqb.EnumColumn) {
-      queries.push(makePopulateEnumQuery(config, column));
+      queries.push(makePopulateEnumQuery(schema, column));
     }
   }
   if (item.type === "add") {
@@ -1439,10 +1441,10 @@ const handlePrerequisitesForTableItem = (config, key, item, queries, addPrimaryK
     }
   } else if (item.type === "change") {
     if (item.from.column instanceof pqb.EnumColumn) {
-      queries.push(makePopulateEnumQuery(config, item.from.column));
+      queries.push(makePopulateEnumQuery(schema, item.from.column));
     }
     if (item.to.column instanceof pqb.EnumColumn) {
-      queries.push(makePopulateEnumQuery(config, item.to.column));
+      queries.push(makePopulateEnumQuery(schema, item.to.column));
     }
     if (item.from.primaryKey) {
       dropPrimaryKeys.columns.push(
@@ -1458,7 +1460,7 @@ const handlePrerequisitesForTableItem = (config, key, item, queries, addPrimaryK
     }
   }
 };
-const handleTableItemChange = (config, key, item, ast, alterTable, renameItems, values, addPrimaryKeys, addIndexes, dropIndexes, addExcludes, dropExcludes, addConstraints, dropConstraints, comments, snakeCase) => {
+const handleTableItemChange = (schema, key, item, ast, alterTable, renameItems, values, addPrimaryKeys, addIndexes, dropIndexes, addExcludes, dropExcludes, addConstraints, dropConstraints, comments, snakeCase) => {
   if (item.type === "add") {
     const column = item.item;
     const name = getColumnName(column, key, snakeCase);
@@ -1467,7 +1469,7 @@ const handleTableItemChange = (config, key, item, ast, alterTable, renameItems,
     addColumnComment(comments, name, column);
     alterTable.push(
       `ADD COLUMN ${columnToSql(
-        config,
+        schema,
         name,
         column,
         values,
@@ -1490,10 +1492,10 @@ const handleTableItemChange = (config, key, item, ast, alterTable, renameItems,
     let changeType = false;
     if (to.type && (from.type !== to.type || from.collate !== to.collate)) {
       changeType = true;
-      const type = !to.column || to.column.data.isOfCustomType ? to.column && to.column instanceof pqb.DomainColumn ? quoteNameFromString(config, to.type) : quoteCustomType(config, to.type) : to.type;
+      const type = !to.column || to.column.data.isOfCustomType ? to.column && to.column instanceof pqb.DomainColumn ? quoteNameFromString(schema, to.type) : quoteCustomType(schema, to.type) : to.type;
       const using = item.using?.usingUp ? ` USING ${item.using.usingUp.toSQL({ values })}` : to.column instanceof pqb.EnumColumn ? ` USING "${name}"::text::${type}` : to.column instanceof pqb.ArrayColumn ? ` USING "${name}"::text[]::${type}` : "";
       alterTable.push(
-        `ALTER COLUMN "${name}" TYPE ${type}${to.collate ? ` COLLATE ${quoteNameFromString(config, to.collate)}` : ""}${using}`
+        `ALTER COLUMN "${name}" TYPE ${type}${to.collate ? ` COLLATE ${quoteNameFromString(schema, to.collate)}` : ""}${using}`
       );
     }
     if (typeof from.identity !== typeof to.identity || !pqb.deepCompare(from.identity, to.identity)) {
@@ -1502,7 +1504,7 @@ const handleTableItemChange = (config, key, item, ast, alterTable, renameItems,
       }
       if (to.identity) {
         alterTable.push(
-          `ALTER COLUMN "${name}" ADD ${identityToSql(config, to.identity)}`
+          `ALTER COLUMN "${name}" ADD ${identityToSql(schema, to.identity)}`
         );
       }
     }
@@ -1635,19 +1637,20 @@ const renameColumnSql = (from, to) => {
 };
 
 const createView = async (migration, up, name, options, sql) => {
-  const ast = makeAst(migration.options, up, name, options, sql);
+  const schema = migration.adapter.getSchema();
+  const ast = makeAst(schema, up, name, options, sql);
   const query = astToQuery(ast);
   await migration.adapter.arrays(interpolateSqlValues(query));
 };
-const makeAst = (config, up, fullName, options, sql) => {
+const makeAst = (schema, up, fullName, options, sql) => {
   if (typeof sql === "string") {
     sql = pqb.raw({ raw: sql });
   }
-  const [schema, name] = getSchemaAndTableFromName(config, fullName);
+  const [s, name] = getSchemaAndTableFromName(schema, fullName);
   return {
     type: "view",
     action: up ? "create" : "drop",
-    schema,
+    schema: s,
     name,
     shape: {},
     sql,
@@ -2235,7 +2238,10 @@ class Migration {
    * @param values - object where keys are for old names, values are for new names
    */
   async renameEnumValues(enumName, values) {
-    const [schema, name] = getSchemaAndTableFromName(this.options, enumName);
+    const [schema, name] = getSchemaAndTableFromName(
+      this.adapter.getSchema(),
+      enumName
+    );
     const ast = {
       type: "renameEnumValues",
       schema,
@@ -2500,7 +2506,10 @@ class Migration {
    */
   async tableExists(tableName) {
     let text = `SELECT 1 FROM "information_schema"."tables" WHERE "table_name" = $1`;
-    const [schema, table] = getSchemaAndTableFromName(this.options, tableName);
+    const [schema, table] = getSchemaAndTableFromName(
+      this.adapter.getSchema(),
+      tableName
+    );
     const values = [table];
     if (schema) {
       text += ' AND "table_schema" = $2';
@@ -2531,7 +2540,10 @@ class Migration {
    */
   async columnExists(tableName, columnName) {
     let text = `SELECT 1 FROM "information_schema"."columns" WHERE "table_name" = $1 AND "column_name" = $2`;
-    const [schema, table] = getSchemaAndTableFromName(this.options, tableName);
+    const [schema, table] = getSchemaAndTableFromName(
+      this.adapter.getSchema(),
+      tableName
+    );
     const values = [
       table,
       this.options.snakeCase ? pqb.toSnakeCase(columnName) : columnName
@@ -2622,7 +2634,10 @@ const createSchema = async (migration, up, name) => {
   );
 };
 const createExtension = async (migration, up, fullName, options) => {
-  const [schema, name] = getSchemaAndTableFromName(migration.options, fullName);
+  const [schema, name] = getSchemaAndTableFromName(
+    migration.adapter.getSchema(),
+    fullName
+  );
   const ast = {
     type: "extension",
     action: up ? "create" : "drop",
@@ -2639,7 +2654,10 @@ const createExtension = async (migration, up, fullName, options) => {
   await migration.adapter.query(query);
 };
 const createEnum = async (migration, up, name, values, options = {}) => {
-  const [schema, enumName] = getSchemaAndTableFromName(migration.options, name);
+  const [schema, enumName] = getSchemaAndTableFromName(
+    migration.adapter.getSchema(),
+    name
+  );
   const ast = {
     type: "enum",
     action: up ? "create" : "drop",
@@ -2659,7 +2677,7 @@ const createEnum = async (migration, up, name, values, options = {}) => {
 };
 const createDomain = async (migration, up, name, fn) => {
   const [schema, domainName] = getSchemaAndTableFromName(
-    migration.options,
+    migration.adapter.getSchema(),
     name
   );
   const ast = {
@@ -2674,10 +2692,7 @@ const createDomain = async (migration, up, name, fn) => {
   const quotedName = quoteWithSchema(ast);
   if (ast.action === "create") {
     const column = ast.baseType;
-    query = `CREATE DOMAIN ${quotedName} AS ${columnTypeToSql(
-      migration.options,
-      column
-    )}${column.data.collate ? `
+    query = `CREATE DOMAIN ${quotedName} AS ${columnTypeToSql(schema, column)}${column.data.collate ? `
 COLLATE "${column.data.collate}"` : ""}${column.data.default !== void 0 ? `
 DEFAULT ${encodeColumnDefault(column.data.default, values)}` : ""}${!column.data.isNullable || column.data.checks ? "\n" : ""}${[
       !column.data.isNullable && "NOT NULL",
@@ -2695,7 +2710,7 @@ DEFAULT ${encodeColumnDefault(column.data.default, values)}` : ""}${!column.data
 };
 const createCollation = async (migration, up, name, options) => {
   const [schema, collationName] = getSchemaAndTableFromName(
-    migration.options,
+    migration.adapter.getSchema(),
     name
   );
   const ast = {
@@ -2711,7 +2726,7 @@ const createCollation = async (migration, up, name, options) => {
     query = `CREATE COLLATION${ast.createIfNotExists ? " IF NOT EXISTS" : ""} ${quotedName} `;
     if (ast.fromExisting) {
       query += `FROM ${quoteNameFromString(
-        migration.options,
+        migration.adapter.getSchema(),
         ast.fromExisting
       )}`;
     } else {
@@ -2737,11 +2752,11 @@ const queryExists = (db, sql) => {
 };
 const renameType = async (migration, from, to, kind) => {
   const [fromSchema, f] = getSchemaAndTableFromName(
-    migration.options,
+    migration.adapter.getSchema(),
     migration.up ? from : to
   );
   const [toSchema, t] = getSchemaAndTableFromName(
-    migration.options,
+    migration.adapter.getSchema(),
     migration.up ? to : from
   );
   const ast = {
@@ -2758,14 +2773,15 @@ const renameType = async (migration, from, to, kind) => {
     );
   }
   if (ast.fromSchema !== ast.toSchema) {
+    const schema = migration.adapter.getSchema();
     await migration.adapter.query(
-      `ALTER ${ast.kind} ${quoteTable(ast.fromSchema, ast.to)} SET SCHEMA "${ast.toSchema ?? migration.options.schema ?? "public"}"`
+      `ALTER ${ast.kind} ${quoteTable(ast.fromSchema, ast.to)} SET SCHEMA "${ast.toSchema ?? (typeof schema === "function" ? schema() : schema) ?? "public"}"`
     );
   }
 };
 const renameTableItem = async (migration, tableName, from, to, kind) => {
   const [schema, table] = getSchemaAndTableFromName(
-    migration.options,
+    migration.adapter.getSchema(),
     tableName
   );
   const [f, t] = migration.up ? [from, to] : [to, from];
@@ -2777,7 +2793,10 @@ const renameTableItem = async (migration, tableName, from, to, kind) => {
   );
 };
 const addOrDropEnumValues = async (migration, up, enumName, values, options) => {
-  const [schema, name] = getSchemaAndTableFromName(migration.options, enumName);
+  const [schema, name] = getSchemaAndTableFromName(
+    migration.adapter.getSchema(),
+    enumName
+  );
   const quotedName = quoteTable(schema, name);
   const ast = {
     type: "enumValues",
@@ -2813,7 +2832,10 @@ const addOrDropEnumValues = async (migration, up, enumName, values, options) =>
   );
 };
 const changeEnumValues = async (migration, enumName, fromValues, toValues) => {
-  const [schema, name] = getSchemaAndTableFromName(migration.options, enumName);
+  const [schema, name] = getSchemaAndTableFromName(
+    migration.adapter.getSchema(),
+    enumName
+  );
   if (!migration.up) {
     const values = fromValues;
     fromValues = toValues;
@@ -2836,7 +2858,7 @@ const changeEnumValues = async (migration, enumName, fromValues, toValues) => {
   );
 };
 const recreateEnum = async (migration, { schema, name }, values, errorMessage) => {
-  const configSchema = migration.options.schema;
+  const configSchema = migration.adapter.getSchema();
   const defaultSchema = (typeof configSchema === "function" ? configSchema() : void 0) ?? "public";
   const quotedName = quoteTable(schema, name);
   const relKinds = ["r", "m"];
@@ -3061,6 +3083,7 @@ ${format === "timestamp" || digits !== 4 ? `Set \`migrationId\`: ${format === "t
 const renameMigrationVersionsInDb = async (config, adapter, values) => {
   await adapter.arrays(
     `UPDATE ${migrationsSchemaTableSql(
+      adapter,
       config
     )} AS t SET version = v.version FROM (VALUES ${values.map(
       ([oldVersion, , newVersion], i) => `('${oldVersion}', $${i + 1}, '${newVersion}')`
@@ -3240,13 +3263,15 @@ function getDigitsPrefix(name) {
 const saveMigratedVersion = async (db, version, name, config) => {
   await db.silentArrays(
     `INSERT INTO ${migrationsSchemaTableSql(
+      db,
       config
     )}(version, name) VALUES ($1, $2)`,
     [version, name]
   );
 };
 const createMigrationsSchemaAndTable = async (db, config) => {
-  const { schema, table } = getMigrationsSchemaAndTable(config);
+  const adapter = getMaybeTransactionAdapter(db);
+  const { schema, table } = getMigrationsSchemaAndTable(adapter, config);
   if (schema) {
     const res2 = await createSchema$1(db, schema);
     if (res2 === "done") {
@@ -3266,6 +3291,7 @@ const createMigrationsSchemaAndTable = async (db, config) => {
 const deleteMigratedVersion = async (adapter, version, name, config) => {
   const res = await adapter.silentArrays(
     `DELETE FROM ${migrationsSchemaTableSql(
+      adapter,
       config
     )} WHERE version = $1 AND name = $2`,
     [version, name]
@@ -3278,7 +3304,7 @@ class NoMigrationsTableError extends Error {
 }
 const getMigratedVersionsMap = async (ctx, adapter, config, renameTo) => {
   try {
-    const table = migrationsSchemaTableSql(config);
+    const table = migrationsSchemaTableSql(adapter, config);
     const result = await adapter.arrays(
       `SELECT * FROM ${table} ORDER BY version`
     );
@@ -3355,7 +3381,7 @@ async function renameMigrations(config, trx, versions, renameTo) {
 }
 
 const transactionIfSingle = (adapter, config, fn) => {
-  return !adapter.isInTransaction() && config.transaction === "single" ? transaction(adapter, fn) : fn(adapter);
+  return !adapter.isInTransaction() && config.transaction === "single" ? transaction(adapter, config, fn) : fn(adapter);
 };
 function makeMigrateFn(up, defaultCount, fn) {
   return async (db, config, params) => {
@@ -3572,8 +3598,12 @@ const getChanges = async (file, config) => {
   }
   return changes;
 };
-const runMigrationInOwnTransaction = (adapter, ...rest) => {
-  return transaction(adapter, (trx) => applyMigration(trx, ...rest));
+const runMigrationInOwnTransaction = (adapter, up, changes, config) => {
+  return transaction(
+    adapter,
+    config,
+    (trx) => applyMigration(trx, up, changes, config)
+  );
 };
 const applyMigration = async (trx, up, changes, config) => {
   const db = createMigrationInterface(trx, up, config);
@@ -3657,9 +3687,10 @@ const createOrDropDatabase = async (action, adapters, config, dontClose) => {
     );
     if (!res) continue;
     if (action === "create") {
-      await adapter.transaction(void 0, async (tx) => {
-        if (config.schema) {
-          const quoted = `"${config.schema}"`;
+      await adapter.transaction(async (tx) => {
+        const schema = tx.getSchema();
+        if (schema) {
+          const quoted = `"${typeof schema === "function" ? schema() : schema}"`;
           const res2 = await createSchema$1(tx, quoted);
           if (res2 === "done") {
             config.logger?.log(`Created schema ${quoted}`);
@@ -3771,7 +3802,7 @@ const astToGenerateItem = (config, ast, currentSchema) => {
     let dep = typeSchemaCache.get(type);
     if (!dep) {
       const [schema = currentSchema, name] = getSchemaAndTableFromName(
-        config,
+        currentSchema,
         type
       );
       dep = `${schema}.${name}`;
@@ -3964,7 +3995,7 @@ const analyzeTableColumns = (config, currentSchema, schema, table, deps, resolve
           )
         );
         const [s = currentSchema, t] = getForeignKeyTable(
-          config,
+          currentSchema,
           fkey.fnOrTable
         );
         const foreignTable = `${s}.${t}`;
@@ -4011,7 +4042,7 @@ const analyzeTableData = (config, currentSchema, schema, table, keys, deps, data
       );
       if (constraint.references) {
         const [s = currentSchema, t] = getForeignKeyTable(
-          config,
+          currentSchema,
           constraint.references.fnOrTable
         );
         deps.push(`${s}.${t}`);
@@ -4148,7 +4179,7 @@ const astEncoders = {
     const isShifted = hasOptions || hasTableData;
     if (isShifted) {
       pqb.addCode(code, `await db.${ast.action}Table(`);
-      const inner = [`${quoteSchemaTable(ast)},`];
+      const inner = [`${quoteSchemaTable(ast, currentSchema)},`];
       code.push(inner);
       code = inner;
       if (hasOptions) {
@@ -4162,7 +4193,10 @@ const astEncoders = {
     } else {
       pqb.addCode(
         code,
-        `await db.${ast.action}Table(${quoteSchemaTable(ast)}, (t) => ({`
+        `await db.${ast.action}Table(${quoteSchemaTable(
+          ast,
+          currentSchema
+        )}, (t) => ({`
       );
     }
     const timestamps = getHasTimestamps(
@@ -4373,9 +4407,9 @@ const astEncoders = {
       ast.to
     )});`;
   },
-  extension(ast) {
+  extension(ast, _, currentSchema) {
     const code = [
-      `await db.${ast.action}Extension(${quoteSchemaTable(ast)}`
+      `await db.${ast.action}Extension(${quoteSchemaTable(ast, currentSchema)}`
     ];
     if (ast.version) {
       pqb.addCode(code, ", {");
@@ -4409,13 +4443,14 @@ const astEncoders = {
   },
   domain(ast, _, currentSchema) {
     return `await db.${ast.action}Domain(${quoteSchemaTable(
-      ast
+      ast,
+      currentSchema
     )}, (t) => ${ast.baseType.toCode(
       { t: "t", table: ast.name, currentSchema },
       ast.baseType.data.name ?? ""
     )});`;
   },
-  collation(ast) {
+  collation(ast, _, currentSchema) {
     const params = [];
     if (ast.locale) params.push(`locale: '${ast.locale}',`);
     if (ast.lcCollate) params.push(`lcCollate: '${ast.lcCollate}',`);
@@ -4424,7 +4459,7 @@ const astEncoders = {
     if (ast.deterministic) params.push(`deterministic: ${ast.deterministic},`);
     if (ast.version) params.push(`version: '${ast.version}',`);
     return [
-      `await db.createCollation(${quoteSchemaTable(ast)}, {`,
+      `await db.createCollation(${quoteSchemaTable(ast, currentSchema)}, {`,
       params,
       "});"
     ];
@@ -4454,8 +4489,10 @@ const astEncoders = {
       })}, ${pqb.singleQuote(ast.from)}, ${pqb.singleQuote(ast.to)});`
     ];
   },
-  view(ast) {
-    const code = [`await db.createView(${quoteSchemaTable(ast)}`];
+  view(ast, _, currentSchema) {
+    const code = [
+      `await db.createView(${quoteSchemaTable(ast, currentSchema)}`
+    ];
     const options = [];
     if (ast.options.recursive) options.push("recursive: true,");
     const w = ast.options.with;
@@ -5046,7 +5083,7 @@ const structureToAst = async (ctx, adapter, config) => {
     });
   }
   const domains = makeDomainsMap(ctx, data);
-  const { schema: migrationsSchema = "public", table: migrationsTable } = getMigrationsSchemaAndTable(config);
+  const { schema: migrationsSchema = "public", table: migrationsTable } = getMigrationsSchemaAndTable(adapter, config);
   for (const table of data.tables) {
     if (table.name === migrationsTable && table.schemaName === migrationsSchema)
       continue;