Skip to content

Commit

Permalink
Fix copy-pasta
Browse files Browse the repository at this point in the history
  • Loading branch information
jwyza-pi committed Jan 6, 2025
1 parent 853a016 commit 8ea28a2
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 11 deletions.
14 changes: 5 additions & 9 deletions src/Core/RevEng.Core.80/ReverseEngineerRunner.cs
Original file line number Diff line number Diff line change
Expand Up @@ -274,27 +274,23 @@ private static void ValidateOptions(ReverseEngineerCommandOptions options, List<
{
if (options.UseDatabaseNames && options.CustomReplacers?.Count > 0)
{
warnings.Add(
$"'use-database-names' / 'UseDatabaseNames' has been set to true, but a '{Constants.RenamingFileName}' file was also found. This prevents '{Constants.RenamingFileName}' from functioning.");
warnings.Add($"'use-database-names' / 'UseDatabaseNames' has been set to true, but a '{Constants.RenamingFileName}' file was also found. This prevents '{Constants.RenamingFileName}' from functioning.");
}

if (options.UseT4 && options.UseT4Split)
{
warnings.Add(
"Both UseT4 and UseT4Split are set to true. Only one of these should be used, UseT4Split will be used.");
warnings.Add("Both UseT4 and UseT4Split are set to true. Only one of these should be used, UseT4Split will be used.");
options.UseT4 = false;
}

if (options.UseDbContextSplitting)
{
warnings.Add(
"UseDbContextSplitting (preview) is obsolete, please switch to the T4 split DbContext template.");
warnings.Add("UseDbContextSplitting (preview) is obsolete, please switch to the T4 split DbContext template.");
}

if (options.UseT4Split && options.UseDbContextSplitting)
{
warnings.Add(
"Both UseDbContextSplitting (preview) and UseT4Split are set to true. Only one of these should be used, UseT4Split will be used.");
warnings.Add("Both UseDbContextSplitting (preview) and UseT4Split are set to true. Only one of these should be used, UseT4Split will be used.");
options.UseDbContextSplitting = false;
}

Expand All @@ -303,7 +299,7 @@ private static void ValidateOptions(ReverseEngineerCommandOptions options, List<
warnings.Add("UseInternalAccessModifiersForSprocsAndFunctions is set to true, but UseT4 or UseT4Split are not true. This will result in conflicting access modifiers for the partial DBContext class. This option is intended for when the T4 templates have been used and are setting the DBContext class to internal rather than public. UseInternalAccessModifiersForSprocsAndFunctions will be reset to false to ensure a valid DBContext is generated.");
options.UseInternalAccessModifiersForSprocsAndFunctions = false;
}
}
}

private static SavedModelFiles CreateCleanupPaths(SavedModelFiles procedurePaths, SavedModelFiles functionPaths, SavedModelFiles filePaths)
{
Expand Down
4 changes: 2 additions & 2 deletions src/GUI/RevEng.Shared/Cli/CliConfigMapper.cs
Original file line number Diff line number Diff line change
Expand Up @@ -185,8 +185,8 @@ public static ReverseEngineerOptions ToOptions(this CliConfig config, string pro
ProjectRootNamespace = names.RootNamespace,
UseDecimalDataAnnotationForSprocResult = config.CodeGeneration.UseDecimalDataAnnotation,
UsePrefixNavigationNaming = config.CodeGeneration.UsePrefixNavigationNaming,
UseDatabaseNamesForRoutines = config.CodeGeneration.UseDatabaseNamesForRoutines,

UseInternalAccessModifiersForSprocsAndFunctions = config.CodeGeneration.UseInternalAccessModifiersForSprocsAndFunctions,

Check warning on line 189 in src/GUI/RevEng.Shared/Cli/CliConfigMapper.cs

View workflow job for this annotation

GitHub Actions / build

Check warning on line 189 in src/GUI/RevEng.Shared/Cli/CliConfigMapper.cs

View workflow job for this annotation

GitHub Actions / build

Check failure on line 189 in src/GUI/RevEng.Shared/Cli/CliConfigMapper.cs

View workflow job for this annotation

GitHub Actions / build

// HandleBars templates are not supported:
UseHandleBars = false,
SelectedHandlebarsLanguage = 0, // handlebars support, will not support it
Expand Down

0 comments on commit 8ea28a2

Please sign in to comment.