rake-db 2.29.7 → 2.29.9

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 import * as pqb from 'pqb';
-import { TableData, ColumnsShape, NoPrimaryKeyOption, MaybeArray, Column, RawSqlBase, RecordString, EnumColumn, EmptyObject, AdapterBase, DbResult, DefaultColumnTypes, DefaultSchemaConfig, QueryLogObject, TableDataFn, TableDataItem, DbDomainArg, ColumnSchemaConfig, raw, Db, MaybePromise, QueryLogOptions, QuerySchema, SearchWeight, ColumnsByType, DbStructureDomainsMap } from 'pqb';
+import { TableData, ColumnsShape, NoPrimaryKeyOption, MaybeArray, Column, RawSqlBase, RecordString, EnumColumn, EmptyObject, AdapterBase, DbResult, DefaultColumnTypes, DefaultSchemaConfig, QueryLogObject, TableDataFn, TableDataItem, DbDomainArg, ColumnSchemaConfig, raw, Db, MaybePromise, QueryLogOptions, QuerySchema, QueryLogger, SearchWeight, ColumnsByType, DbStructureDomainsMap } from 'pqb';
 
 type RakeDbAst = RakeDbAst.Table | RakeDbAst.ChangeTable | RakeDbAst.RenameType | RakeDbAst.Schema | RakeDbAst.RenameSchema | RakeDbAst.Extension | RakeDbAst.Enum | RakeDbAst.EnumValues | RakeDbAst.RenameEnumValues | RakeDbAst.ChangeEnumValues | RakeDbAst.Domain | RakeDbAst.Collation | RakeDbAst.Constraint | RakeDbAst.RenameTableItem | RakeDbAst.View;
 declare namespace RakeDbAst {
@@ -1511,13 +1511,18 @@ declare const promptSelect: ({ message, options, active, inactive, }: {
     inactive?: (s: string) => string;
 }) => Promise<number>;
 
-declare const saveMigratedVersion: (db: SilentQueries, version: string, name: string, config: Pick<RakeDbConfig, 'migrationsTable'>) => Promise<void>;
-
 interface OrmParam {
     $getAdapter(): AdapterBase;
 }
 type DbParam = OrmParam | AdapterBase;
 
+declare const saveMigratedVersion: (db: SilentQueries, version: string, name: string, config: Pick<RakeDbConfig, 'migrationsTable'>) => Promise<void>;
+declare const createMigrationsSchemaAndTable: (db: DbParam, config: {
+    schema?: QuerySchema;
+    migrationsTable: string;
+    logger?: QueryLogger;
+}) => Promise<void>;
+
 interface MigrateFnParams {
     ctx?: RakeDbCtx;
     count?: number;
@@ -1841,4 +1846,4 @@ declare const dropTable: (db: DbParam, sql: string) => Promise<'done' | 'already
 declare class RakeDbError extends Error {
 }
 
-export { type ChangeCallback, type DbMigration, DbStructure, type IntrospectedStructure, RakeDbAst, type RakeDbChangeFn, type RakeDbCliConfigInput, type RakeDbConfig, RakeDbError, type RakeDbFn, type SilentQueries, type StructureToAstCtx, type StructureToAstTableData, astToMigration, concatSchemaAndName, createDatabase, createMigrationInterface, createSchema, createTable, dbColumnToAst, dropDatabase, dropSchema, dropTable, encodeColumnDefault, getConstraintName, getDbStructureTableData, getDbTableColumnsChecks, getExcludeName, getIndexName, getMigrationsSchemaAndTable, getSchemaAndTableFromName, incrementIntermediateCaller, instantiateDbColumn, introspectDbSchema, makeDomainsMap, makeFileVersion, makeRakeDbConfig, makeStructureToAstCtx, migrate, migrateAndClose, migrationConfigDefaults, promptSelect, rakeDbCliWithAdapter, rakeDbCommands, redo, rollback, runMigration, saveMigratedVersion, setRakeDbCliRunFn, structureToAst, tableToAst, writeMigrationFile };
+export { type ChangeCallback, type DbMigration, DbStructure, type IntrospectedStructure, RakeDbAst, type RakeDbChangeFn, type RakeDbCliConfigInput, type RakeDbConfig, RakeDbError, type RakeDbFn, type SilentQueries, type StructureToAstCtx, type StructureToAstTableData, astToMigration, concatSchemaAndName, createDatabase, createMigrationInterface, createMigrationsSchemaAndTable, createSchema, createTable, dbColumnToAst, dropDatabase, dropSchema, dropTable, encodeColumnDefault, getConstraintName, getDbStructureTableData, getDbTableColumnsChecks, getExcludeName, getIndexName, getMigrationsSchemaAndTable, getSchemaAndTableFromName, incrementIntermediateCaller, instantiateDbColumn, introspectDbSchema, makeDomainsMap, makeFileVersion, makeRakeDbConfig, makeStructureToAstCtx, migrate, migrateAndClose, migrationConfigDefaults, promptSelect, rakeDbCliWithAdapter, rakeDbCommands, redo, rollback, runMigration, saveMigratedVersion, setRakeDbCliRunFn, structureToAst, tableToAst, writeMigrationFile };

package/dist/index.js

@@ -408,7 +408,7 @@ const columnToSql = (config, name, item, values, hasMultiplePrimaryKeys, snakeCa
 const encodeColumnDefault = (def, values, column) => {
   if (def !== void 0 && def !== null && typeof def !== "function") {
     if (pqb.isRawSQL(def)) {
-      return def.toSQL({ values });
+      return `(${def.toSQL({ values })})`;
     } else {
       return pqb.escapeForMigration(
         column instanceof pqb.ArrayColumn && Array.isArray(def) ? "{" + (column.data.item.data.encode ? def.map((x) => column.data.item.data.encode(x)) : def).join(",") + "}" : column?.data.encode ? column.data.encode(def) : def
@@ -3245,16 +3245,16 @@ const saveMigratedVersion = async (db, version, name, config) => {
     [version, name]
   );
 };
-const createMigrationsSchemaAndTable = async (adapter, config) => {
+const createMigrationsSchemaAndTable = async (db, config) => {
   const { schema, table } = getMigrationsSchemaAndTable(config);
   if (schema) {
-    const res2 = await createSchema$1(adapter, schema);
+    const res2 = await createSchema$1(db, schema);
     if (res2 === "done") {
       config.logger?.log(`Created schema "${schema}"`);
     }
   }
   const res = await createTable$1(
-    adapter,
+    db,
     `${schema ? `"${schema}"."${table}"` : `"${table}"`} (version TEXT NOT NULL, name TEXT NOT NULL)`
   );
   if (res === "done") {
@@ -6081,6 +6081,7 @@ exports.astToMigration = astToMigration;
 exports.concatSchemaAndName = concatSchemaAndName;
 exports.createDatabase = createDatabase;
 exports.createMigrationInterface = createMigrationInterface;
+exports.createMigrationsSchemaAndTable = createMigrationsSchemaAndTable;
 exports.createSchema = createSchema$1;
 exports.createTable = createTable$1;
 exports.dbColumnToAst = dbColumnToAst;