Add new advanced option: "No default DbContext constructor"

ErikEJ · Jul 11, 2021 · b85c77d · b85c77d
1 parent 1ea6a14
commit b85c77d
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 4 deletions.
diff --git a/src/GUI/RevEng.Core/ReverseEngineerRunner.cs b/src/GUI/RevEng.Core/ReverseEngineerRunner.cs
@@ -101,9 +101,8 @@ public static ReverseEngineerResult GenerateFiles(ReverseEngineerCommandOptions
                         File.WriteAllLines(filePaths.ContextFile, dbContextLines);
                     }
                 }
-#else
-                RemoveOnConfiguring(filePaths.ContextFile, options.IncludeConnectionString);
 #endif
+                RemoveFragments(filePaths.ContextFile, options.ContextClassName, options.IncludeConnectionString, options.UseNoDefaultConstructor);
                 if (!options.UseHandleBars)
                 {
                     PostProcess(filePaths.ContextFile);
@@ -189,15 +188,26 @@ private static List<string> SplitDbContext(string contextFile, bool useDbContext
             return DbContextSplitter.Split(contextFile, contextNamespace, supportNullable);
         }
 
-        private static void RemoveOnConfiguring(string contextFile, bool includeConnectionString)
+        private static void RemoveFragments(string contextFile, string contextName, bool includeConnectionString, bool removeDefaultConstructor)
         {
             if (string.IsNullOrEmpty(contextFile))
             {
                 return;
             }
 
             var finalLines = new List<string>();
-            var lines = File.ReadAllLines(contextFile);
+            var lines = File.ReadAllLines(contextFile).ToList();
+
+            if (removeDefaultConstructor)
+            {
+                var index = lines.IndexOf($"        public {contextName}()");
+                if (index != -1)
+                {
+                    lines.RemoveAt(index + 2);
+                    lines.RemoveAt(index + 1);
+                    lines.RemoveAt(index);
+                }
+            }
 
             int i = 1;
             var inConfiguring = false;
@@ -227,6 +237,7 @@ private static void RemoveOnConfiguring(string contextFile, bool includeConnecti
                 finalLines.Add(line);
                 i++;
             }
+
             File.WriteAllLines(contextFile, finalLines, Encoding.UTF8);
         }
 

diff --git a/src/GUI/efreveng/TestFiles/fulltest.json b/src/GUI/efreveng/TestFiles/fulltest.json
@@ -264,6 +264,7 @@
   "UseInflector": true,
   "UseLegacyPluralizer": false,
   "UseNoConstructor": false,
+  "UseNoDefaultConstructor": true,
   "UseNoNavigations": false,
   "UseNodaTime": true,
   "UseNullableReferences": false,

diff --git a/src/GUI/lib/efreveng.exe.zip b/src/GUI/lib/efreveng.exe.zip
diff --git a/src/GUI/lib/efreveng50.exe.zip b/src/GUI/lib/efreveng50.exe.zip
diff --git a/src/GUI/lib/efreveng60.exe.zip b/src/GUI/lib/efreveng60.exe.zip