rake-db 2.4.6 → 2.4.7

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import { ColumnType, EnumColumn, ColumnTypes, ColumnsShape, DbResult, DefaultColumnTypes, TransactionAdapter, QueryLogObject, IndexColumnOptions, IndexOptions, ForeignKeyOptions, TextColumn, NoPrimaryKeyOption, TableData, SingleColumnIndexOptions, AdapterOptions, QueryLogOptions } from 'pqb';
+import { ColumnType, EnumColumn, ColumnTypes, ColumnsShape, DbResult, DefaultColumnTypes, TransactionAdapter, QueryLogObject, IndexColumnOptions, IndexOptions, ForeignKeyOptions, TextColumn, NoPrimaryKeyOption, TableData, SingleColumnIndexOptions, AdapterOptions, QueryLogOptions, Adapter } from 'pqb';
 import { EmptyObject, RawExpression, ColumnTypesBase, raw, MaybeArray } from 'orchid-core';
 
 declare function add(this: ColumnTypesBase, item: ColumnType, options?: {
@@ -216,8 +216,9 @@ declare const createDb: (arg: MaybeArray<AdapterOptions>, config: RakeDbConfig)
 declare const dropDb: (arg: MaybeArray<AdapterOptions>) => Promise<void>;
 declare const resetDb: (arg: MaybeArray<AdapterOptions>, config: RakeDbConfig) => Promise<void>;
 
-declare const writeMigrationFile: (config: RakeDbConfig, name: string, content: string) => Promise<void>;
+declare const writeMigrationFile: (config: RakeDbConfig, version: string, name: string, content: string) => Promise<void>;
 declare const generate: (config: RakeDbConfig, args: string[]) => Promise<void>;
+declare const makeFileTimeStamp: () => string;
 
 declare type ChangeCallback = (db: Migration, up: boolean) => Promise<void>;
 declare const change: (fn: ChangeCallback) => void;
@@ -229,4 +230,8 @@ declare const rollback: (options: MaybeArray<AdapterOptions>, config: RakeDbConf
 
 declare const rakeDb: (options: MaybeArray<AdapterOptions>, partialConfig?: Partial<RakeDbConfig>, args?: string[]) => Promise<void>;
 
-export { AppCodeUpdater, ChangeTableCallback, ChangeTableOptions, ColumnComment, ColumnsShapeCallback, DropMode, Migration, MigrationBase, MigrationColumnTypes, RakeDbAst, RakeDbConfig, TableOptions, change, changeCache, createDb, createMigrationInterface, dropDb, generate, migrate, migrateOrRollback, rakeDb, resetDb, rollback, writeMigrationFile };
+declare const saveMigratedVersion: (db: Adapter, version: string, config: RakeDbConfig) => Promise<void>;
+declare const removeMigratedVersion: (db: Adapter, version: string, config: RakeDbConfig) => Promise<void>;
+declare const getMigratedVersionsMap: (db: Adapter, config: RakeDbConfig) => Promise<Record<string, boolean>>;
+
+export { AppCodeUpdater, ChangeTableCallback, ChangeTableOptions, ColumnComment, ColumnsShapeCallback, DropMode, Migration, MigrationBase, MigrationColumnTypes, RakeDbAst, RakeDbConfig, TableOptions, change, changeCache, createDb, createMigrationInterface, dropDb, generate, getMigratedVersionsMap, makeFileTimeStamp, migrate, migrateOrRollback, rakeDb, removeMigratedVersion, resetDb, rollback, saveMigratedVersion, writeMigrationFile };

package/dist/index.js

@@ -1250,6 +1250,36 @@ const queryExists = (db, sql) => {
   return db.adapter.query(sql).then(({ rowCount }) => rowCount > 0);
 };
 
+const saveMigratedVersion = async (db, version, config) => {
+  await db.query(
+    `INSERT INTO ${quoteWithSchema({
+      name: config.migrationsTable
+    })} VALUES ('${version}')`
+  );
+};
+const removeMigratedVersion = async (db, version, config) => {
+  await db.query(
+    `DELETE FROM ${quoteWithSchema({
+      name: config.migrationsTable
+    })} WHERE version = '${version}'`
+  );
+};
+const getMigratedVersionsMap = async (db, config) => {
+  try {
+    const result = await db.arrays(
+      `SELECT *
+       FROM ${quoteWithSchema({ name: config.migrationsTable })}`
+    );
+    return Object.fromEntries(result.rows.map((row) => [row[0], true]));
+  } catch (err) {
+    if (err.code === "42P01") {
+      await createSchemaMigrations(db, config);
+      return {};
+    }
+    throw err;
+  }
+};
+
 var __defProp$1 = Object.defineProperty;
 var __getOwnPropSymbols$1 = Object.getOwnPropertySymbols;
 var __hasOwnProp$1 = Object.prototype.hasOwnProperty;
@@ -1362,34 +1392,6 @@ const processMigration = async (db, up, file, config, options, appCodeUpdaterCac
     }));
   }
 };
-const saveMigratedVersion = async (db, version, config) => {
-  await db.query(
-    `INSERT INTO ${quoteWithSchema({
-      name: config.migrationsTable
-    })} VALUES ('${version}')`
-  );
-};
-const removeMigratedVersion = async (db, version, config) => {
-  await db.query(
-    `DELETE FROM ${quoteWithSchema({
-      name: config.migrationsTable
-    })} WHERE version = '${version}'`
-  );
-};
-const getMigratedVersionsMap = async (db, config) => {
-  try {
-    const result = await db.arrays(
-      `SELECT * FROM ${quoteWithSchema({ name: config.migrationsTable })}`
-    );
-    return Object.fromEntries(result.rows.map((row) => [row[0], true]));
-  } catch (err) {
-    if (err.code === "42P01") {
-      await createSchemaMigrations(db, config);
-      return {};
-    }
-    throw err;
-  }
-};
 const migrate = (options, config, args = []) => migrateOrRollback(options, config, args, true);
 const rollback = (options, config, args = []) => migrateOrRollback(options, config, args, false);
 
@@ -1493,13 +1495,10 @@ const resetDb = async (arg, config) => {
   await migrate(arg, config);
 };
 
-const writeMigrationFile = async (config, name, content) => {
+const writeMigrationFile = async (config, version, name, content) => {
   var _a;
   await promises.mkdir(config.migrationsPath, { recursive: true });
-  const filePath = path__default["default"].resolve(
-    config.migrationsPath,
-    `${makeFileTimeStamp()}_${name}.ts`
-  );
+  const filePath = path__default["default"].resolve(config.migrationsPath, `${version}_${name}.ts`);
   await promises.writeFile(filePath, content);
   (_a = config.logger) == null ? void 0 : _a.log(`Created ${orchidCore.pathToLog(filePath)}`);
 };
@@ -1507,7 +1506,13 @@ const generate = async (config, args) => {
   const name = args[0];
   if (!name)
     throw new Error("Migration name is missing");
-  await writeMigrationFile(config, name, makeContent(name, args.slice(1)));
+  const version = makeFileTimeStamp();
+  await writeMigrationFile(
+    config,
+    version,
+    name,
+    makeContent(name, args.slice(1))
+  );
 };
 const makeFileTimeStamp = () => {
   const now = new Date();
@@ -2293,7 +2298,9 @@ const pullDbStructure = async (options, config) => {
   const result = astToMigration(config, ast);
   if (!result)
     return;
-  await writeMigrationFile(config, "pull", result);
+  const version = makeFileTimeStamp();
+  await writeMigrationFile(config, version, "pull", result);
+  await saveMigratedVersion(adapter, version, config);
   const cache = {};
   for (const item of ast) {
     await ((_a = config == null ? void 0 : config.appCodeUpdater) == null ? void 0 : _a.call(config, {
@@ -2381,10 +2388,14 @@ exports.createDb = createDb;
 exports.createMigrationInterface = createMigrationInterface;
 exports.dropDb = dropDb;
 exports.generate = generate;
+exports.getMigratedVersionsMap = getMigratedVersionsMap;
+exports.makeFileTimeStamp = makeFileTimeStamp;
 exports.migrate = migrate;
 exports.migrateOrRollback = migrateOrRollback;
 exports.rakeDb = rakeDb;
+exports.removeMigratedVersion = removeMigratedVersion;
 exports.resetDb = resetDb;
 exports.rollback = rollback;
+exports.saveMigratedVersion = saveMigratedVersion;
 exports.writeMigrationFile = writeMigrationFile;
 //# sourceMappingURL=index.js.map