fixed regexp, removed step limit, display progress

Cli/Cli.fsproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
-        <Version>0.0.7</Version>
+        <Version>0.0.8</Version>
         <OutputType>Exe</OutputType>
         <TargetFramework>net8.0</TargetFramework>
         <PackAsTool>true</PackAsTool>

Lib/Execution/Commit.fs

@@ -21,9 +21,6 @@ open SqlParser.Types
 open Migrate.SqlGeneration
 open NuGet.Versioning
 
-[<Literal>]
-let stepsLimit = 20
-
 let replicateInDb (schema: SqlFile) (dbFile: string) =
 
   let tables = schema.tables |> List.map Table.sqlCreateTable
@@ -70,24 +67,29 @@ let migrateStep (p: Project) : ProposalResult list option =
     Print.printRed $"got error\n{e.Message}"
     None
 
+let printProgress (n: int) =
+  let prog = [| "/"; "-"; "\\"; "|" |]
+  let i = n % prog.Length
+  printf $"\r{prog[i]}"
+
 let migrateDb (p: Project) =
   let mutable stop = false
   let mutable steps = ResizeArray<ProposalResult>()
   let mutable last = []
+  let mutable i = 0
+
+  while not stop do
+    printProgress i
+    i <- i + 1
 
-  while not stop && steps.Count <> stepsLimit do
     match migrateStep p with
     | Some xs when steps.Count > 0 && xs = last -> StaleMigration xs |> raise
     | Some xs ->
       last <- xs
       xs |> List.iter steps.Add
-    | None -> stop <- true
-
-  if steps.Count = stepsLimit then
-    Print.printYellow (
-      $"Reached maximum steps {stepsLimit}."
-      + "You would need to rerun again to continue migration"
-    )
+    | None ->
+      printfn "\r"
+      stop <- true
 
   steps |> List.ofSeq
 

Lib/Execution/MigrationStore.fs

@@ -264,9 +264,10 @@ let getMigrations (p: Project) =
     migrationLog)
 
 let parseReason r =
-  let added = Regex "Added \"(\\w+)\""
-  let removed = Regex "Removed \"(\\w+)\""
-  let changed = Regex "Changed \(\"(\\w+)\",\\s+\"(\\w+)\"\)"
+  let elem = @""
+  let added = Regex @"Added ""(.*)"""
+  let removed = Regex @"Removed ""(.*)"""
+  let changed = Regex @"Changed \(""(.*)"",\s+""(.*)""\)"
   let ra = added.Match r
   let rr = removed.Match r
   let rc = changed.Match r

Lib/Lib.fsproj

@@ -3,7 +3,7 @@
         <TargetFramework>net8.0</TargetFramework>
         <GenerateDocumentationFile>true</GenerateDocumentationFile>
         <PackageId>MigrateLib</PackageId>
-        <Version>0.0.7</Version>
+        <Version>0.0.8</Version>
         <Authors>Luis Ángel Méndez Gort</Authors>
         <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
         <AssemblyName>Migrate</AssemblyName>