rake-db 2.31.0 → 2.32.0

package/dist/index.d.ts

@@ -1,6 +1,6 @@
 import * as pqb_internal from 'pqb/internal';
-import { SearchWeight, RecordOptionalString, DefaultPrivileges, AdapterBase, TableData, ColumnsShape, NoPrimaryKeyOption, MaybeArray, Column, RawSqlBase, RecordString, EnumColumn, EmptyObject, DbResult, QueryLogObject, TableDataFn, TableDataItem, DbDomainArg, ColumnSchemaConfig, raw, DefaultColumnTypes, DefaultSchemaConfig, Db, QuerySchema, QueryLogger, MaybePromise, QueryLogOptions, ColumnsByType, DbStructureDomainsMap } from 'pqb/internal';
-import * as packages_pqb_src_query from 'packages/pqb/src/query';
+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 {
@@ -430,7 +430,7 @@ declare namespace RakeDbAst {
         grant?: DefaultPrivilegeObjectConfig;
         revoke?: DefaultPrivilegeObjectConfig;
     }
-    export {  };
+    export {};
 }
 
 declare function add(item: Column, options?: {
@@ -487,22 +487,22 @@ declare const tableChangeMethods: {
         columns: Columns;
         name: string extends Name ? never : Name;
     };
-    unique<Columns_1 extends [string | TableData.Index.ColumnOrExpressionOptions<string>, ...(string | TableData.Index.ColumnOrExpressionOptions<string>)[]], Name_1 extends string>(columns: Columns_1, options?: TableData.Index.UniqueOptionsArg<Name_1> | undefined): {
+    unique<Columns extends [string | TableData.Index.ColumnOrExpressionOptions<string>, ...(string | TableData.Index.ColumnOrExpressionOptions<string>)[]], Name extends string>(columns: Columns, options?: TableData.Index.UniqueOptionsArg<Name> | undefined): {
         tableDataItem: true;
-        columns: Columns_1 extends (string | TableData.Index.ColumnOptionsForColumn<string>)[] ? { [I in keyof Columns_1]: "column" extends keyof Columns_1[I] ? Columns_1[I][keyof Columns_1[I] & "column"] : Columns_1[I]; } : never;
-        name: string extends Name_1 ? never : Name_1;
+        columns: Columns extends (string | TableData.Index.ColumnOptionsForColumn<string>)[] ? { [I in keyof Columns]: "column" extends keyof Columns[I] ? Columns[I][keyof Columns[I] & "column"] : Columns[I]; } : never;
+        name: string extends Name ? never : Name;
     };
-    index(columns: (string | TableData.Index.ColumnOrExpressionOptions<string>)[], options?: TableData.Index.OptionsArg | undefined): pqb_internal.NonUniqDataItem;
-    searchIndex(columns: (string | TableData.Index.ColumnOrExpressionOptions<string>)[], options?: TableData.Index.TsVectorArg | undefined): pqb_internal.NonUniqDataItem;
-    exclude(columns: TableData.Exclude.ColumnOrExpressionOptions<string>[], options?: TableData.Exclude.Options | undefined): pqb_internal.NonUniqDataItem;
+    index(columns: (string | TableData.Index.ColumnOrExpressionOptions<string>)[], options?: TableData.Index.OptionsArg): pqb_internal.NonUniqDataItem;
+    searchIndex(columns: (string | TableData.Index.ColumnOrExpressionOptions<string>)[], options?: TableData.Index.TsVectorArg): pqb_internal.NonUniqDataItem;
+    exclude(columns: TableData.Exclude.ColumnOrExpressionOptions<string>[], options?: TableData.Exclude.Options): pqb_internal.NonUniqDataItem;
     foreignKey<Shape>(columns: [string, ...string[]], fnOrTable: () => new () => {
         columns: {
             shape: Shape;
         };
-    }, foreignColumns: [keyof Shape, ...(keyof Shape)[]], options?: TableData.References.Options | undefined): pqb_internal.NonUniqDataItem;
-    foreignKey(columns: [string, ...string[]], fnOrTable: string, foreignColumns: [string, ...string[]], options?: TableData.References.Options | undefined): pqb_internal.NonUniqDataItem;
-    check(check: RawSqlBase, name?: string | undefined): pqb_internal.NonUniqDataItem;
-    sql: packages_pqb_src_query.SqlFn;
+    }, foreignColumns: [keyof Shape, ...(keyof Shape)[]], options?: TableData.References.Options): pqb_internal.NonUniqDataItem;
+    foreignKey(columns: [string, ...string[]], fnOrTable: string, foreignColumns: [string, ...string[]], options?: TableData.References.Options): pqb_internal.NonUniqDataItem;
+    check(check: RawSqlBase, name?: string): pqb_internal.NonUniqDataItem;
+    sql: pqb_internal.SqlFn;
     enum(name: string): EnumColumn<pqb_internal.DefaultSchemaConfig, undefined, [string, ...string[]]>;
 };
 type TableChanger<CT> = MigrationColumnTypes<CT> & TableChangeMethods;
@@ -574,7 +574,7 @@ interface MigrationInterfaceResult {
  * @param up - migrate or rollback
  * @param config - config of `rakeDb`
  */
-declare const createMigrationInterface: (tx: AdapterBase, up: boolean, config: Pick<RakeDbConfig, 'log' | 'logger'>) => MigrationInterfaceResult;
+declare const createMigrationInterface: (tx: AdapterBase, up: boolean, config: Pick<RakeDbConfig, "log" | "logger">) => MigrationInterfaceResult;
 type MigrationAdapter = AdapterBase;
 declare class Migration<CT = unknown> {
     adapter: MigrationAdapter;
@@ -1531,7 +1531,7 @@ interface OrmParam {
 }
 type DbParam = OrmParam | AdapterBase;
 
-declare const saveMigratedVersion: (db: SilentQueries, version: string, name: string, config: Pick<RakeDbConfig, 'migrationsTable'>) => Promise<void>;
+declare const saveMigratedVersion: (db: SilentQueries, version: string, name: string, config: Pick<RakeDbConfig, "migrationsTable">) => Promise<void>;
 declare const createMigrationsSchemaAndTable: (db: DbParam, config: {
     migrationsTable: string;
     logger?: QueryLogger;
@@ -1556,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;
@@ -1916,11 +1920,11 @@ interface StructureToAstTableData {
     constraints: DbStructure.Constraint[];
     roles?: DbStructure.Role[];
 }
-declare const makeStructureToAstCtx: (config: Pick<RakeDbConfig, 'snakeCase' | 'schemaConfig'>, currentSchema: string) => StructureToAstCtx;
-declare const structureToAst: (ctx: StructureToAstCtx, adapter: AdapterBase, config: Pick<RakeDbConfig, 'migrationsTable'>) => Promise<RakeDbAst[]>;
+declare const makeStructureToAstCtx: (config: Pick<RakeDbConfig, "snakeCase" | "schemaConfig">, currentSchema: string) => StructureToAstCtx;
+declare const structureToAst: (ctx: StructureToAstCtx, adapter: AdapterBase, config: Pick<RakeDbConfig, "migrationsTable">) => Promise<RakeDbAst[]>;
 declare const makeDomainsMap: (ctx: StructureToAstCtx, data: IntrospectedStructure) => DbStructureDomainsMap;
 declare const instantiateDbColumn: (ctx: StructureToAstCtx, data: IntrospectedStructure, domains: DbStructureDomainsMap, dbColumn: DbStructure.Column) => Column<pqb_internal.ColumnTypeSchemaArg, unknown, any, any, unknown, unknown, any, unknown, any>;
-declare const tableToAst: (ctx: StructureToAstCtx, data: IntrospectedStructure, table: DbStructure.Table, action: 'create' | 'drop', domains: DbStructureDomainsMap) => RakeDbAst.Table;
+declare const tableToAst: (ctx: StructureToAstCtx, data: IntrospectedStructure, table: DbStructure.Table, action: "create" | "drop", domains: DbStructureDomainsMap) => RakeDbAst.Table;
 declare const getDbStructureTableData: (data: IntrospectedStructure, { name, schemaName }: DbStructure.Table) => StructureToAstTableData;
 interface ColumnChecks {
     [K: string]: string[];
@@ -1986,7 +1990,7 @@ declare const dropDatabase: (db: DbParam, { database }: {
  * const result: 'done' | 'already' = await createSchema(db, '"schema"');
  * ```
  */
-declare const createSchema: (db: DbParam, sql: string) => Promise<'done' | 'already'>;
+declare const createSchema: (db: DbParam, sql: string) => Promise<"done" | "already">;
 /**
  * `dropSchema` uses a savepoint when it is called in a transaction to not break it if the schema does not exist.
  *
@@ -1998,7 +2002,7 @@ declare const createSchema: (db: DbParam, sql: string) => Promise<'done' | 'alre
  * const result: 'done' | 'already' = await dropSchema(db, '"schema"');
  * ```
  */
-declare const dropSchema: (db: DbParam, sql: string) => Promise<'done' | 'already'>;
+declare const dropSchema: (db: DbParam, sql: string) => Promise<"done" | "already">;
 /**
  * `createTable` uses a savepoint when it is called in a transaction to not break it if the table already exists.
  *
@@ -2010,7 +2014,7 @@ declare const dropSchema: (db: DbParam, sql: string) => Promise<'done' | 'alread
  * const result: 'done' | 'already' = await createTable(db, '"table"');
  * ```
  */
-declare const createTable: (db: DbParam, sql: string) => Promise<'done' | 'already'>;
+declare const createTable: (db: DbParam, sql: string) => Promise<"done" | "already">;
 /**
  * `dropTable` uses a savepoint when it is called in a transaction to not break it if the table does not exist.
  *
@@ -2022,9 +2026,10 @@ declare const createTable: (db: DbParam, sql: string) => Promise<'done' | 'alrea
  * const result: 'done' | 'already' = await dropTable(db, '"table"');
  * ```
  */
-declare const dropTable: (db: DbParam, sql: string) => Promise<'done' | 'already'>;
+declare const dropTable: (db: DbParam, sql: string) => Promise<"done" | "already">;
 
 declare class RakeDbError extends Error {
 }
 
-export { type ChangeCallback$1 as ChangeCallback, type DbMigration, DbStructure, type IntrospectedStructure, type MigrateConfig, type MigrateFn, type MigrationChangeFn, RakeDbAst, type RakeDbChangeFnConfig, type RakeDbCliConfigInput, type RakeDbConfig, RakeDbError, type RakeDbFn, type SilentQueries, type StructureToAstCtx, type StructureToAstTableData, astToMigration, concatSchemaAndName, createDatabase, createMigrationChangeFn, createMigrationInterface, createMigrationsSchemaAndTable, createSchema, createTable, dbColumnToAst, dropDatabase, dropSchema, dropTable, encodeColumnDefault, getConstraintName, getDbStructureTableData, getDbTableColumnsChecks, getDbVersion, getExcludeName, getIndexName, getMigrationsSchemaAndTable, getSchemaAndTableFromName, incrementIntermediateCaller, instantiateDbColumn, introspectDbSchema, makeDomainsMap, makeFileVersion, makeStructureToAstCtx, migrate, migrateAndClose, promptSelect, rakeDbCliWithAdapter, rakeDbCommands, rakeDbConfigDefaults, redo, rollback, runMigration, saveMigratedVersion, setRakeDbCliRunFn, structureToAst, tableToAst, writeMigrationFile };
+export { DbStructure, RakeDbAst, RakeDbError, astToMigration, concatSchemaAndName, createDatabase, createMigrationChangeFn, createMigrationInterface, createMigrationsSchemaAndTable, createSchema, createTable, dbColumnToAst, dropDatabase, dropSchema, dropTable, encodeColumnDefault, getConstraintName, getDbStructureTableData, getDbTableColumnsChecks, getDbVersion, getExcludeName, getIndexName, getMigrationsSchemaAndTable, getSchemaAndTableFromName, incrementIntermediateCaller, instantiateDbColumn, introspectDbSchema, makeDomainsMap, makeFileVersion, makeStructureToAstCtx, migrate, migrateAndClose, promptSelect, rakeDbCliWithAdapter, rakeDbCommands, rakeDbConfigDefaults, redo, rollback, runMigration, saveMigratedVersion, setRakeDbCliRunFn, structureToAst, tableToAst, writeMigrationFile };
+export type { ChangeCallback$1 as ChangeCallback, DbMigration, IntrospectedStructure, MigrateConfig, MigrateFn, MigrationChangeFn, RakeDbChangeFnConfig, RakeDbCliConfigInput, RakeDbCliResult, RakeDbConfig, RakeDbFn, SilentQueries, StructureToAstCtx, StructureToAstTableData };

package/dist/index.js

@@ -3,6 +3,7 @@
 var internal = require('pqb/internal');
 var path = require('path');
 var node_url = require('node:url');
+var pqb = require('pqb');
 var fs = require('fs/promises');
 var path$1 = require('node:path');
 
@@ -160,7 +161,6 @@ const columnToSql = (schema, name, item, values, hasMultiplePrimaryKeys, snakeCa
         referencesToSql(
           schema,
           {
-            columns: [name],
             ...foreignKey
           },
           snakeCase
@@ -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);
 };
@@ -1751,7 +1751,7 @@ const createMigrationInterface = (tx, up, config) => {
     getDb(columnTypes) {
       let db = dbPerColumnTypes.get(columnTypes);
       if (!db) {
-        db = internal.createDbWithAdapter({
+        db = pqb.createDbWithAdapter({
           adapter,
           columnTypes
         });
@@ -2282,7 +2282,6 @@ class Migration {
       enumName
     );
     const ast = {
-      type: "renameEnumValues",
       schema,
       name,
       values
@@ -2698,10 +2697,7 @@ const addCheck = (migration, up, tableName, check) => {
 };
 const createSchema$1 = async (migration, up, name) => {
   const ast = {
-    type: "schema",
-    action: up ? "create" : "drop",
-    name
-  };
+    action: up ? "create" : "drop"};
   await migration.adapter.query(
     `${ast.action === "create" ? "CREATE" : "DROP"} SCHEMA "${name}"`
   );
@@ -2712,7 +2708,6 @@ const createExtension = async (migration, up, fullName, options) => {
     fullName
   );
   const ast = {
-    type: "extension",
     action: up ? "create" : "drop",
     schema,
     name,
@@ -2732,11 +2727,9 @@ const createEnum = async (migration, up, name, values, options = {}) => {
     name
   );
   const ast = {
-    type: "enum",
     action: up ? "create" : "drop",
     schema,
     name: enumName,
-    values,
     ...options
   };
   let query;
@@ -2754,7 +2747,6 @@ const createDomain = async (migration, up, name, fn) => {
     name
   );
   const ast = {
-    type: "domain",
     action: up ? "create" : "drop",
     schema,
     name: domainName,
@@ -2787,7 +2779,6 @@ const createCollation = async (migration, up, name, options) => {
     name
   );
   const ast = {
-    type: "collation",
     action: up ? "create" : "drop",
     schema,
     name: collationName,
@@ -2833,7 +2824,6 @@ const renameType = async (migration, from, to, kind) => {
     migration.up ? to : from
   );
   const ast = {
-    type: "renameType",
     kind,
     fromSchema,
     from: f,
@@ -2872,7 +2862,6 @@ const addOrDropEnumValues = async (migration, up, enumName, values, options) =>
   );
   const quotedName = quoteTable(schema, name);
   const ast = {
-    type: "enumValues",
     action: up ? "add" : "drop",
     schema,
     name,
@@ -2915,10 +2904,8 @@ const changeEnumValues = async (migration, enumName, fromValues, toValues) => {
     toValues = values;
   }
   const ast = {
-    type: "changeEnumValues",
     schema,
     name,
-    fromValues,
     toValues
   };
   await recreateEnum(
@@ -3543,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);
@@ -3669,7 +3662,7 @@ const redo = makeMigrateFn(
     );
   }
 );
-const getDb = (adapter) => internal.createDbWithAdapter({ adapter });
+const getDb = (adapter) => pqb.createDbWithAdapter({ adapter });
 const migrateOrRollback = async (trx, config, set, versions, count, up, redo2, force, skipLock) => {
   const { sequence, map: versionsMap } = versions;
   if (up) {
@@ -4024,7 +4017,7 @@ const runRecurrentMigrations = async (adapters, config) => {
   let files = 0;
   await readdirRecursive(config.recurrentPath, async (path) => {
     files++;
-    dbs ?? (dbs = adapters.map((adapter) => internal.createDbWithAdapter({ adapter })));
+    dbs ?? (dbs = adapters.map((adapter) => pqb.createDbWithAdapter({ adapter })));
     const sql = await fs.readFile(path, "utf-8");
     await Promise.all(
       dbs.map(async (db) => {
@@ -6574,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(