rake-db 2.0.7 → 2.0.9

package/.env.local

@@ -1 +1,2 @@
 DATABASE_URL=postgres://postgres:@localhost:5432/porm
+DATABASE_URL_TEST=postgres://postgres:@localhost:5432/porm_test

package/db.ts

@@ -10,7 +10,12 @@ if (!connectionString) {
   throw new Error('DATABASE_URL is missing in .env');
 }
 
+const connectionStringTest = process.env.DATABASE_URL_TEST;
+if (!connectionStringTest) {
+  throw new Error('DATABASE_URL_TEST is missing in .env');
+}
+
 rakeDb(
-  { connectionString },
+  [{ connectionString }, { connectionString: connectionStringTest }],
   { migrationsPath: path.resolve(process.cwd(), 'migrations') },
 );

package/dist/index.d.ts

@@ -8,11 +8,12 @@ declare type MigrationConfig = {
 
 declare const createDb: (arg: MaybeArray<AdapterOptions>, config: MigrationConfig) => Promise<void>;
 declare const dropDb: (arg: MaybeArray<AdapterOptions>) => Promise<void>;
+declare const resetDb: (arg: MaybeArray<AdapterOptions>, config: MigrationConfig) => Promise<void>;
 
 declare const generate: (config: MigrationConfig, args: string[]) => Promise<void>;
 
-declare const migrate: (options: MaybeArray<AdapterOptions>, config: MigrationConfig, args: string[]) => Promise<void>;
-declare const rollback: (options: MaybeArray<AdapterOptions>, config: MigrationConfig, args: string[]) => Promise<void>;
+declare const migrate: (options: MaybeArray<AdapterOptions>, config: MigrationConfig, args?: string[]) => Promise<void>;
+declare const rollback: (options: MaybeArray<AdapterOptions>, config: MigrationConfig, args?: string[]) => Promise<void>;
 
 declare function add(item: ColumnType, options?: {
     dropMode?: DropMode;
@@ -119,8 +120,9 @@ declare class Migration extends TransactionAdapter {
     constraintExists(constraintName: string): Promise<boolean>;
 }
 
-declare const change: (fn: (db: Migration, up: boolean) => Promise<void>) => void;
+declare type ChangeCallback = (db: Migration, up: boolean) => Promise<void>;
+declare const change: (fn: ChangeCallback) => void;
 
 declare const rakeDb: (options: MaybeArray<AdapterOptions>, partialConfig?: Partial<MigrationConfig>, args?: string[]) => Promise<void>;
 
-export { ChangeTableCallback, ChangeTableOptions, ColumnComment, ColumnIndex, ColumnsShapeCallback, DropMode, ExtensionOptions, JoinTableOptions, Migration, TableOptions, change, createDb, dropDb, generate, migrate, rakeDb, rollback };
+export { ChangeTableCallback, ChangeTableOptions, ColumnComment, ColumnIndex, ColumnsShapeCallback, DropMode, ExtensionOptions, JoinTableOptions, Migration, TableOptions, change, createDb, dropDb, generate, migrate, rakeDb, resetDb, rollback };

package/dist/index.esm.js

@@ -1,4 +1,4 @@
-import { toArray, Adapter, quote, isRaw, getRaw, getColumnTypes, columnTypes, getTableData, ColumnType, Operators, resetTableData, emptyObject, TransactionAdapter, logParamToLogObject } from 'pqb';
+import { quote, isRaw, getRaw, toArray, getColumnTypes, columnTypes, getTableData, ColumnType, Operators, resetTableData, emptyObject, TransactionAdapter, logParamToLogObject, Adapter } from 'pqb';
 import Enquirer from 'enquirer';
 import path from 'path';
 import { readdir, mkdir, writeFile } from 'fs/promises';
@@ -181,156 +181,15 @@ const quoteTable = (table) => {
   }
 };
 
-const execute = async (options, sql) => {
-  const db = new Adapter(options);
-  try {
-    await db.query(sql);
-    return "ok";
-  } catch (error) {
-    const err = error;
-    if (err.code === "42P04" || err.code === "3D000") {
-      return "already";
-    } else if (err.code === "42501") {
-      return "forbidden";
-    } else {
-      return { error };
-    }
-  } finally {
-    await db.destroy();
-  }
-};
-const createOrDrop = async (options, adminOptions, config, args) => {
-  const params = getDatabaseAndUserFromOptions(options);
-  const result = await execute(
-    setAdapterOptions(adminOptions, { database: "postgres" }),
-    args.sql(params)
-  );
-  if (result === "ok") {
-    console.log(args.successMessage(params));
-  } else if (result === "already") {
-    console.log(args.alreadyMessage(params));
-  } else if (result === "forbidden") {
-    await createOrDrop(
-      options,
-      await setAdminCredentialsToOptions(options),
-      config,
-      args
-    );
-    return;
-  } else {
-    throw result.error;
-  }
-  if (!args.createVersionsTable)
-    return;
-  const db = new Adapter(options);
-  await createSchemaMigrations(db, config);
-  await db.destroy();
-};
-const createDb = async (arg, config) => {
-  for (const options of toArray(arg)) {
-    await createOrDrop(options, options, config, {
-      sql({ database, user }) {
-        return `CREATE DATABASE "${database}" OWNER "${user}"`;
-      },
-      successMessage({ database }) {
-        return `Database ${database} successfully created`;
-      },
-      alreadyMessage({ database }) {
-        return `Database ${database} already exists`;
-      },
-      createVersionsTable: true
-    });
-  }
-};
-const dropDb = async (arg) => {
-  for (const options of toArray(arg)) {
-    await createOrDrop(options, options, migrationConfigDefaults, {
-      sql({ database }) {
-        return `DROP DATABASE "${database}"`;
-      },
-      successMessage({ database }) {
-        return `Database ${database} was successfully dropped`;
-      },
-      alreadyMessage({ database }) {
-        return `Database ${database} does not exist`;
-      }
-    });
-  }
-};
-
-const generate = async (config, args) => {
-  const name = args[0];
-  if (!name)
-    throw new Error("Migration name is missing");
-  await mkdir(config.migrationsPath, { recursive: true });
-  const filePath = path.resolve(
-    config.migrationsPath,
-    `${makeFileTimeStamp()}_${name}.ts`
-  );
-  await writeFile(filePath, makeContent(name, args.slice(1)));
-  console.log(`Created ${filePath}`);
-};
-const makeFileTimeStamp = () => {
-  const now = new Date();
-  return [
-    now.getUTCFullYear(),
-    now.getUTCMonth() + 1,
-    now.getUTCDate(),
-    now.getUTCHours(),
-    now.getUTCMinutes(),
-    now.getUTCSeconds()
-  ].map((value) => value < 10 ? `0${value}` : value).join("");
-};
-const makeContent = (name, args) => {
-  let content = `import { change } from 'rake-db';
-
-change(async (db) => {`;
-  const [first, rest] = getFirstWordAndRest(name);
-  if (rest) {
-    if (first === "create" || first === "drop") {
-      content += `
-  await db.${first === "create" ? "createTable" : "dropTable"}('${rest}', (t) => ({`;
-      content += makeColumnsContent(args);
-      content += "\n  }));";
-    } else if (first === "change") {
-      content += `
-  await db.changeTable('${rest}', (t) => ({`;
-      content += "\n  }));";
-    } else if (first === "add" || first === "remove") {
-      const table = first === "add" ? getTextAfterTo(rest) : getTextAfterFrom(rest);
-      content += `
-  await db.changeTable(${table ? `'${table}'` : "tableName"}, (t) => ({`;
-      content += makeColumnsContent(args, first);
-      content += "\n  }));";
-    }
-  }
-  return content + "\n});\n";
-};
-const makeColumnsContent = (args, method) => {
-  let content = "";
-  const prepend = method ? `t.${method}(` : "";
-  const append = method ? ")" : "";
-  for (const arg of args) {
-    const [name, def] = arg.split(":");
-    if (!def) {
-      throw new Error(
-        `Column argument should be similar to name:type, name:type.method1.method2, name:type(arg).method(arg). Example: name:varchar(20).nullable. Received: ${arg}`
-      );
-    }
-    const methods = def.split(".").map((method2) => method2.endsWith(")") ? `.${method2}` : `.${method2}()`);
-    content += `
-    ${name}: ${prepend}t${methods.join("")}${append},`;
-  }
-  return content;
-};
-
 let currentMigration;
 let currentPromise;
 let currentUp = true;
+let currentChangeCallback;
 const change = (fn) => {
   if (!currentMigration)
     throw new Error("Database instance is not set");
   currentPromise = fn(currentMigration, currentUp);
+  currentChangeCallback = fn;
 };
 const setCurrentMigration = (db) => {
   currentMigration = db;
@@ -339,6 +198,7 @@ const setCurrentMigrationUp = (up) => {
   currentUp = up;
 };
 const getCurrentPromise = () => currentPromise;
+const getCurrentChangeCallback = () => currentChangeCallback;
 
 var __defProp$2 = Object.defineProperty;
 var __defProps$2 = Object.defineProperties;
@@ -1090,12 +950,19 @@ const migrateOrRollback = async (options, config, args, up) => {
     }
   }
 };
+const changeCache = {};
 const processMigration = async (db, up, file, config) => {
   await db.transaction(async (tx) => {
     const db2 = new Migration(tx, up, config);
     setCurrentMigration(db2);
     setCurrentMigrationUp(up);
-    config.requireTs(file.path);
+    const callback = changeCache[file.path];
+    if (callback) {
+      change(callback);
+    } else {
+      config.requireTs(file.path);
+      changeCache[file.path] = getCurrentChangeCallback();
+    }
     await getCurrentPromise();
     await (up ? saveMigratedVersion : removeMigratedVersion)(
       db2,
@@ -1130,8 +997,156 @@ const getMigratedVersionsMap = async (db, config) => {
     throw err;
   }
 };
-const migrate = (options, config, args) => migrateOrRollback(options, config, args, true);
-const rollback = (options, config, args) => migrateOrRollback(options, config, args, false);
+const migrate = (options, config, args = []) => migrateOrRollback(options, config, args, true);
+const rollback = (options, config, args = []) => migrateOrRollback(options, config, args, false);
+
+const execute = async (options, sql) => {
+  const db = new Adapter(options);
+  try {
+    await db.query(sql);
+    return "ok";
+  } catch (error) {
+    const err = error;
+    if (err.code === "42P04" || err.code === "3D000") {
+      return "already";
+    } else if (err.code === "42501") {
+      return "forbidden";
+    } else {
+      return { error };
+    }
+  } finally {
+    await db.destroy();
+  }
+};
+const createOrDrop = async (options, adminOptions, config, args) => {
+  const params = getDatabaseAndUserFromOptions(options);
+  const result = await execute(
+    setAdapterOptions(adminOptions, { database: "postgres" }),
+    args.sql(params)
+  );
+  if (result === "ok") {
+    console.log(args.successMessage(params));
+  } else if (result === "already") {
+    console.log(args.alreadyMessage(params));
+  } else if (result === "forbidden") {
+    await createOrDrop(
+      options,
+      await setAdminCredentialsToOptions(options),
+      config,
+      args
+    );
+    return;
+  } else {
+    throw result.error;
+  }
+  if (!args.createVersionsTable)
+    return;
+  const db = new Adapter(options);
+  await createSchemaMigrations(db, config);
+  await db.destroy();
+};
+const createDb = async (arg, config) => {
+  for (const options of toArray(arg)) {
+    await createOrDrop(options, options, config, {
+      sql({ database, user }) {
+        return `CREATE DATABASE "${database}" OWNER "${user}"`;
+      },
+      successMessage({ database }) {
+        return `Database ${database} successfully created`;
+      },
+      alreadyMessage({ database }) {
+        return `Database ${database} already exists`;
+      },
+      createVersionsTable: true
+    });
+  }
+};
+const dropDb = async (arg) => {
+  for (const options of toArray(arg)) {
+    await createOrDrop(options, options, migrationConfigDefaults, {
+      sql({ database }) {
+        return `DROP DATABASE "${database}"`;
+      },
+      successMessage({ database }) {
+        return `Database ${database} was successfully dropped`;
+      },
+      alreadyMessage({ database }) {
+        return `Database ${database} does not exist`;
+      }
+    });
+  }
+};
+const resetDb = async (arg, config) => {
+  await dropDb(arg);
+  await createDb(arg, config);
+  await migrate(arg, config);
+};
+
+const generate = async (config, args) => {
+  const name = args[0];
+  if (!name)
+    throw new Error("Migration name is missing");
+  await mkdir(config.migrationsPath, { recursive: true });
+  const filePath = path.resolve(
+    config.migrationsPath,
+    `${makeFileTimeStamp()}_${name}.ts`
+  );
+  await writeFile(filePath, makeContent(name, args.slice(1)));
+  console.log(`Created ${filePath}`);
+};
+const makeFileTimeStamp = () => {
+  const now = new Date();
+  return [
+    now.getUTCFullYear(),
+    now.getUTCMonth() + 1,
+    now.getUTCDate(),
+    now.getUTCHours(),
+    now.getUTCMinutes(),
+    now.getUTCSeconds()
+  ].map((value) => value < 10 ? `0${value}` : value).join("");
+};
+const makeContent = (name, args) => {
+  let content = `import { change } from 'rake-db';
+
+change(async (db) => {`;
+  const [first, rest] = getFirstWordAndRest(name);
+  if (rest) {
+    if (first === "create" || first === "drop") {
+      content += `
+  await db.${first === "create" ? "createTable" : "dropTable"}('${rest}', (t) => ({`;
+      content += makeColumnsContent(args);
+      content += "\n  }));";
+    } else if (first === "change") {
+      content += `
+  await db.changeTable('${rest}', (t) => ({`;
+      content += "\n  }));";
+    } else if (first === "add" || first === "remove") {
+      const table = first === "add" ? getTextAfterTo(rest) : getTextAfterFrom(rest);
+      content += `
+  await db.changeTable(${table ? `'${table}'` : "tableName"}, (t) => ({`;
+      content += makeColumnsContent(args, first);
+      content += "\n  }));";
+    }
+  }
+  return content + "\n});\n";
+};
+const makeColumnsContent = (args, method) => {
+  let content = "";
+  const prepend = method ? `t.${method}(` : "";
+  const append = method ? ")" : "";
+  for (const arg of args) {
+    const [name, def] = arg.split(":");
+    if (!def) {
+      throw new Error(
+        `Column argument should be similar to name:type, name:type.method1.method2, name:type(arg).method(arg). Example: name:varchar(20).nullable. Received: ${arg}`
+      );
+    }
+    const methods = def.split(".").map((method2) => method2.endsWith(")") ? `.${method2}` : `.${method2}()`);
+    content += `
+    ${name}: ${prepend}t${methods.join("")}${append},`;
+  }
+  return content;
+};
 
 const rakeDb = async (options, partialConfig = {}, args = process.argv.slice(2)) => {
   const config = getMigrationConfigWithDefaults(partialConfig);
@@ -1140,6 +1155,8 @@ const rakeDb = async (options, partialConfig = {}, args = process.argv.slice(2))
     await createDb(options, config);
   } else if (command === "drop") {
     await dropDb(options);
+  } else if (command === "reset") {
+    await resetDb(options, config);
   } else if (command === "migrate") {
     await migrate(options, config, args.slice(1));
   } else if (command === "rollback") {
@@ -1154,9 +1171,10 @@ const printHelp = () => console.log(
   `Usage: rake-db [command] [arguments]
 
 Commands:
-  create                  creates databases
-  drop                    drops databases
-  g, generate             generates migration file, see below
+  create                  create databases
+  drop                    drop databases
+  reset                   drop, create and migrate databases
+  g, generate             generate migration file, see below
   migrate                 migrate all pending migrations
   rollback                rollback the last migrated
   no or unknown command   prints this message
@@ -1174,5 +1192,5 @@ Generate arguments:
 `
 );
 
-export { Migration, change, createDb, dropDb, generate, migrate, rakeDb, rollback };
+export { Migration, change, createDb, dropDb, generate, migrate, rakeDb, resetDb, rollback };
 //# sourceMappingURL=index.esm.js.map