rake-db 2.25.14 → 2.25.16

package/dist/index.js

@@ -7,9 +7,9 @@ var node_url = require('node:url');
 var fs = require('fs/promises');
 
 const getFirstWordAndRest = (input) => {
-  const i = input.search(/(?=[A-Z])|[-_]/);
+  const i = input.search(/(?=[A-Z])|[-_ ]/);
   if (i !== -1) {
-    const restStart = input[i] === "-" || input[i] === "_" ? i + 1 : i;
+    const restStart = input[i] === "-" || input[i] === "_" || input[i] === " " ? i + 1 : i;
     const rest = input.slice(restStart);
     return [input.slice(0, i), rest[0].toLowerCase() + rest.slice(1)];
   } else {
@@ -19,17 +19,17 @@ const getFirstWordAndRest = (input) => {
 const getTextAfterRegExp = (input, regex, length) => {
   let i = input.search(regex);
   if (i === -1) return;
-  if (input[i] === "-" || input[i] === "_") i++;
+  if (input[i] === "-" || input[i] === "_" || input[i] === " ") i++;
   i += length;
-  const start = input[i] == "-" || input[i] === "_" ? i + 1 : i;
+  const start = input[i] == "-" || input[i] === "_" || input[i] === " " ? i + 1 : i;
   const text = input.slice(start);
   return text[0].toLowerCase() + text.slice(1);
 };
 const getTextAfterTo = (input) => {
-  return getTextAfterRegExp(input, /(To|-to|_to)[A-Z-_]/, 2);
+  return getTextAfterRegExp(input, /(To|-to|_to| to)[A-Z-_ ]/, 2);
 };
 const getTextAfterFrom = (input) => {
-  return getTextAfterRegExp(input, /(From|-from|_from)[A-Z-_]/, 4);
+  return getTextAfterRegExp(input, /(From|-from|_from| from)[A-Z-_ ]/, 4);
 };
 const joinWords = (...words) => {
   return words.slice(1).reduce(
@@ -2533,7 +2533,10 @@ GROUP BY n.nspname, c.relname`
 
 const writeMigrationFile = async (config, version, name, migrationCode) => {
   await fs.mkdir(config.migrationsPath, { recursive: true });
-  const filePath = path.resolve(config.migrationsPath, `${version}_${name}.ts`);
+  const filePath = path.resolve(
+    config.migrationsPath,
+    `${version}_${name.replaceAll(" ", "-")}.ts`
+  );
   const importPath = orchidCore.getImportPath(
     filePath,
     path.join(config.basePath, config.dbScript)
@@ -3166,6 +3169,24 @@ const migrateOrRollback = async (trx, config, set, versions, count, up, redo2, f
   return migrations;
 };
 const checkMigrationOrder = (config, set, { sequence, map }, force) => {
+  if (config.migrationId !== "timestamp") {
+    let prev = set.migrations[0];
+    for (let i = 1; i < set.migrations.length; i++) {
+      const file = set.migrations[i];
+      const version = +file.version;
+      const prevVersion = +prev.version;
+      if (version === prevVersion) {
+        throw new Error(
+          `Found migrations with the same number: ${prev.path} and ${file.path}`
+        );
+      } else if (version - prevVersion > 1) {
+        throw new Error(
+          `There is a gap between migrations ${prev.path} and ${file.path}`
+        );
+      }
+      prev = file;
+    }
+  }
   const last = sequence[sequence.length - 1];
   if (last) {
     for (const file of set.migrations) {