rake-db 2.36.13 → 2.36.15

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-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 { Adapter, Column as Column$1, ColumnSchemaConfig, 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 {
@@ -576,7 +576,7 @@ declare namespace RakeDbAst {
   export {};
 }
 interface TableMethods {
-  enum(name: string): EnumColumn<ColumnTypeSchemaArg, undefined, [string, ...string[]]>;
+  enum(name: string): EnumColumn<DefaultSchemaConfig, undefined, [string, ...string[]]>;
 }
 type Add = typeof add;
 declare function add(item: Column$1, options?: {
@@ -721,7 +721,7 @@ type TableOptions = {
   language?: string;
 };
 type MigrationColumnTypes<CT> = Omit<CT, 'enum'> & {
-  enum: (name: string) => EnumColumn<ColumnSchemaConfig, unknown, readonly string[]>;
+  enum: (name: string) => EnumColumn<DefaultSchemaConfig, unknown, readonly string[]>;
 };
 type ColumnsShapeCallback<CT, Shape extends ColumnsShape = ColumnsShape> = (t: MigrationColumnTypes<CT> & {
   raw: typeof raw;

package/dist/index.js

@@ -3220,18 +3220,19 @@ async function renameMigrations(config, trx, versions, renameTo) {
 	await renameMigrationVersionsInDb(config, trx, values);
 	return updatedVersions;
 }
-const migrateConfigDefaults = {
-	migrationId: { serial: 4 },
-	migrationsTable: "schemaMigrations",
-	transaction: "single"
-};
 const handleConfigLogger = (config, db) => {
 	const q = db ? "$qb" in db && db.$qb ? db.$qb.q : "q" in db ? db.q : void 0 : void 0;
+	const queryLogger = q?.log && q.logger;
 	return {
 		log: config.log ?? q?.log,
-		logger: config.log === true ? config.logger || q?.logger || console : config.log === false ? void 0 : config.logger || q?.logger
+		logger: config.log === true ? config.logger || queryLogger || console : config.log === false ? void 0 : config.logger || queryLogger
 	};
 };
+const migrateConfigDefaults = {
+	migrationId: { serial: 4 },
+	migrationsTable: "schemaMigrations",
+	transaction: "single"
+};
 /**
 * Process a PublicRakeDbConfig into RakeDbConfig by handling the `log` option.
 * This is used by public migration functions (migrate, rollback, redo) to