From 5a6aff12900b335cc0dce35be582b83a20691824 Mon Sep 17 00:00:00 2001
From: fabianlindfors <fabian@flapplabs.se>
Date: Tue, 26 Jul 2022 16:00:08 +0200
Subject: [PATCH] Fix migration files not sorted naturally

Closes #15
---
 Cargo.toml  |  3 ++-
 src/main.rs | 16 ++++++++++++----
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 7363771..a312ded 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -22,4 +22,5 @@ toml = "0.5"
 version = "3.0.0"
 colored = "2"
 rand = "0.8"
-dotenv = "0.15.0"
\ No newline at end of file
+dotenv = "0.15.0"
+lexical-sort = "0.3.1"
\ No newline at end of file
diff --git a/src/main.rs b/src/main.rs
index 41d64fa..5baf940 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -4,7 +4,7 @@ use std::{
     path::Path,
 };
 
-use anyhow::{Context};
+use anyhow::Context;
 use clap::{Args, Parser};
 use reshape::{
     migrations::{Action, Migration},
@@ -196,7 +196,13 @@ fn find_migrations(opts: &FindMigrationsOptions) -> anyhow::Result<Vec<Migration
     }
 
     // Sort all files by their file names (without extension)
-    file_paths.sort_unstable_by_key(|path| path.as_path().file_stem().unwrap().to_os_string());
+    // The files are sorted naturally, e.g. "1_test_migration" < "10_test_migration"
+    file_paths.sort_unstable_by(|path1, path2| {
+        let file1 = path1.as_path().file_stem().unwrap().to_str().unwrap();
+        let file2 = path2.as_path().file_stem().unwrap().to_str().unwrap();
+
+        lexical_sort::natural_cmp(file1, file2)
+    });
 
     file_paths
         .iter()
@@ -212,8 +218,10 @@ fn find_migrations(opts: &FindMigrationsOptions) -> anyhow::Result<Vec<Migration
         .map(|result| {
             result.and_then(|(path, data)| {
                 let extension = path.extension().and_then(|ext| ext.to_str()).unwrap();
-                let file_migration = decode_migration_file(&data, extension)
-                    .with_context(|| format!("failed to parse migration file {}", path.display()))?;
+                let file_migration =
+                    decode_migration_file(&data, extension).with_context(|| {
+                        format!("failed to parse migration file {}", path.display())
+                    })?;
 
                 let file_name = path.file_stem().and_then(|name| name.to_str()).unwrap();
                 Ok(Migration {