rake-db 2.36.1 → 2.36.3

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 import * as _$pqb_internal0 from "pqb/internal";
-import { Adapter, Column as Column$1, ColumnSchemaConfig, ColumnTypeSchemaArg, ColumnsByType, ColumnsShape, DbDomainArg, DbResult, DbStructureDomainsMap, DefaultColumnTypes, DefaultPrivileges, DefaultSchemaConfig, EmptyObject, EnumColumn, Grant, MaybeArray, MaybePromise, NoPrimaryKeyOption, NonUniqDataItem, QueryLogObject, QueryLogOptions, QueryLogger, QuerySchema, RawSqlBase, RecordOptionalString, RecordString, RlsPolicy, SearchWeight, TableData, TableDataFn, TableDataItem, TableDataMethods, raw } from "pqb/internal";
+import { Adapter, Column as Column$1, ColumnSchemaConfig, ColumnTypeSchemaArg, ColumnsByType, ColumnsShape, DbDomainArg, DbResult, DbStructureDomainsMap, DefaultColumnTypes, DefaultPrivileges, DefaultSchemaConfig, EmptyObject, EnumColumn, Grant, MaybeArray, MaybePromise, NoPrimaryKeyOption, NonUniqDataItem, PickQueryQ, QueryData, QueryLogObject, QueryLogOptions, QueryLogger, QuerySchema, RawSqlBase, RecordOptionalString, RecordString, RlsPolicy, SearchWeight, TableData, TableDataFn, TableDataItem, TableDataMethods, raw } from "pqb/internal";
 import { Db } from "pqb";
 declare namespace DbStructure {
   interface TableNameAndSchemaName {
@@ -1635,6 +1635,8 @@ interface MigrationChange {
 }
 type ChangeCallback<ColumnTypes> = (db: DbMigration<ColumnTypes>, up: boolean) => Promise<void>;
 interface OrmParam {
+  $qb?: PickQueryQ;
+  q?: QueryData;
   $getAdapter(): Adapter;
 }
 type DbParam = OrmParam | Adapter;

package/dist/index.js

@@ -3157,8 +3157,12 @@ const migrateConfigDefaults = {
 	migrationsTable: "schemaMigrations",
 	transaction: "single"
 };
-const handleConfigLogger = (config) => {
-	return config.log === true ? config.logger || console : config.log === false ? void 0 : config.logger;
+const handleConfigLogger = (config, db) => {
+	const q = db ? "$qb" in db && db.$qb ? db.$qb.q : "q" in db ? db.q : void 0 : void 0;
+	return {
+		log: config.log ?? q?.log,
+		logger: config.log === true ? config.logger || q?.logger || console : config.log === false ? void 0 : config.logger || q?.logger
+	};
 };
 /**
 * Process a PublicRakeDbConfig into RakeDbConfig by handling the `log` option.
@@ -3170,9 +3174,10 @@ const handleConfigLogger = (config) => {
 * - `log: undefined` → preserves existing `logger`
 *
 * @param config - the public config with optional `log` setting
+* @param db - optionally provided by `migrate` to get the logger from it
 * @returns a processed RakeDbConfig ready for internal use
 */
-const processMigrateConfig = (config) => {
+const processMigrateConfig = (config, db) => {
 	let migrationsPath;
 	if (!("migrations" in config)) {
 		migrationsPath = config.migrationsPath ? config.migrationsPath : node_path.default.join("src", "db", "migrations");
@@ -3182,7 +3187,7 @@ const processMigrateConfig = (config) => {
 		...migrateConfigDefaults,
 		...config,
 		migrationsPath,
-		logger: handleConfigLogger(config)
+		...handleConfigLogger(config, db)
 	};
 	if ("baseTable" in config && config.baseTable) {
 		const { snakeCase, language } = config.baseTable.prototype;
@@ -3196,7 +3201,7 @@ const transactionIfSingle = (adapter, config, fn) => {
 };
 function makeMigrateFn(up, defaultCount, fn) {
 	return async (db, publicConfig, params) => {
-		const config = processMigrateConfig(publicConfig);
+		const config = processMigrateConfig(publicConfig, db);
 		const ctx = params?.ctx || {};
 		const set = await getMigrations(ctx, config, up);
 		const count = params?.count ?? defaultCount;
@@ -3244,7 +3249,7 @@ async function runMigration(db, ...args) {
 	const [rawConfig, migration] = args.length === 1 ? [{}, args[0]] : [args[0], args[1]];
 	const config = {
 		...rawConfig,
-		logger: handleConfigLogger(rawConfig)
+		...handleConfigLogger(rawConfig)
 	};
 	await transaction(getMaybeTransactionAdapter(db), config, async (trx) => {
 		clearChanges();