rake-db 2.31.1 → 2.32.0

package/dist/index.d.ts

@@ -1,5 +1,6 @@
 import * as pqb_internal from 'pqb/internal';
-import { SearchWeight, RecordOptionalString, DefaultPrivileges, AdapterBase, TableData, ColumnsShape, NoPrimaryKeyOption, MaybeArray, Column, RawSqlBase, RecordString, EmptyObject, EnumColumn, DbResult, QueryLogObject, ColumnSchemaConfig, raw, TableDataFn, TableDataItem, DbDomainArg, DefaultColumnTypes, DefaultSchemaConfig, Db, QuerySchema, QueryLogger, QueryLogOptions, MaybePromise, ColumnsByType, DbStructureDomainsMap } from 'pqb/internal';
+import { SearchWeight, RecordOptionalString, DefaultPrivileges, AdapterBase, TableData, ColumnsShape, NoPrimaryKeyOption, MaybeArray, Column, RawSqlBase, RecordString, EmptyObject, EnumColumn, DbResult, QueryLogObject, ColumnSchemaConfig, raw, TableDataFn, TableDataItem, DbDomainArg, DefaultColumnTypes, DefaultSchemaConfig, QueryLogger, QueryLogOptions, MaybePromise, ColumnsByType, DbStructureDomainsMap } from 'pqb/internal';
+import { Db, QuerySchema } from 'pqb';
 
 declare namespace DbStructure {
     interface TableNameAndSchemaName {
@@ -1555,6 +1556,10 @@ interface MigrateConfigBase extends QueryLogOptions {
     afterMigrate?: MigrationCallback;
     beforeRollback?: MigrationCallback;
     afterRollback?: MigrationCallback;
+    snakeCase?: boolean;
+    language?: string;
+    noPrimaryKey?: NoPrimaryKeyOption;
+    baseTable?: RakeDbBaseTable<unknown>;
 }
 interface MigrateConfigFileBased extends MigrateConfigBase {
     basePath?: string;

package/dist/index.js

@@ -1390,7 +1390,7 @@ const pushIndexesOrExcludes = (key, from, to, name, add2, drop2) => {
 };
 const getChangeColumnName = (what, change, key, snakeCase) => {
   return change.name || (change[what].column ? (
-    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+    //
     getColumnName(change[what].column, key, snakeCase)
   ) : snakeCase ? internal.toSnakeCase(key) : key);
 };
@@ -3530,12 +3530,18 @@ const processMigrateConfig = (config) => {
       migrationsPath = path$1.resolve(config.basePath, migrationsPath);
     }
   }
-  return {
+  const result = {
     ...migrateConfigDefaults,
     ...config,
     migrationsPath,
     logger: handleConfigLogger(config)
   };
+  if ("baseTable" in config && config.baseTable) {
+    const { snakeCase, language } = config.baseTable.prototype;
+    if (snakeCase) result.snakeCase = true;
+    if (language) result.language = language;
+  }
+  return result;
 };
 const transactionIfSingle = (adapter, config, fn) => {
   return config.transaction === "single" ? transaction(adapter, config, fn) : fn(adapter);
@@ -6561,10 +6567,8 @@ const makeRakeDbConfig = (config, args) => {
     result.recurrentPath = path.resolve(result.basePath, result.recurrentPath);
   }
   if ("baseTable" in config && config.baseTable) {
-    const { types, snakeCase, language } = config.baseTable.prototype;
+    const { types } = config.baseTable.prototype;
     result.columnTypes = types || internal.makeColumnTypes(internal.defaultSchemaConfig);
-    if (snakeCase) result.snakeCase = true;
-    if (language) result.language = language;
   } else {
     const ct = "columnTypes" in config && config.columnTypes;
     result.columnTypes = (typeof ct === "function" ? ct(