diff --git a/EFCore.NamingConventions.Test/LowerNamingTest.cs b/EFCore.NamingConventions.Test/LowerCaseNamingTest.cs similarity index 97% rename from EFCore.NamingConventions.Test/LowerNamingTest.cs rename to EFCore.NamingConventions.Test/LowerCaseNamingTest.cs index 45a03a5..a669455 100644 --- a/EFCore.NamingConventions.Test/LowerNamingTest.cs +++ b/EFCore.NamingConventions.Test/LowerCaseNamingTest.cs @@ -3,7 +3,7 @@ using Xunit; namespace EFCore.Naming.Test { - public class LowerNamingTest + public class LowerCaseNamingTest { [Fact] public void Table_name_is_rewritten() diff --git a/EFCore.NamingConventions.Test/SnakeNamingTest.cs b/EFCore.NamingConventions.Test/SnakeCaseNamingTest.cs similarity index 97% rename from EFCore.NamingConventions.Test/SnakeNamingTest.cs rename to EFCore.NamingConventions.Test/SnakeCaseNamingTest.cs index 3a974c2..5b4f684 100644 --- a/EFCore.NamingConventions.Test/SnakeNamingTest.cs +++ b/EFCore.NamingConventions.Test/SnakeCaseNamingTest.cs @@ -3,7 +3,7 @@ using Xunit; namespace EFCore.Naming.Test { - public class SnakeNamingTest + public class SnakeCaseNamingTest { [Fact] public void Table_name_is_rewritten() diff --git a/EFCore.NamingConventions/NamingConventions/Internal/LowerCaseNameRewriter.cs b/EFCore.NamingConventions/NamingConventions/Internal/LowerCaseNameRewriter.cs index 8bd16a4..6a77615 100644 --- a/EFCore.NamingConventions/NamingConventions/Internal/LowerCaseNameRewriter.cs +++ b/EFCore.NamingConventions/NamingConventions/Internal/LowerCaseNameRewriter.cs @@ -7,11 +7,11 @@ namespace EFCore.NamingConventions.Internal class LowerCaseNameRewriter : NameRewriterBase { public override void ProcessEntityTypeAdded( - IConventionEntityTypeBuilder entityTypeBuilder, - IConventionContext context) - => entityTypeBuilder.ToTable( - entityTypeBuilder.Metadata.GetTableName().ToLowerInvariant(), - entityTypeBuilder.Metadata.GetSchema()); + IConventionEntityTypeBuilder entityTypeBuilder, + IConventionContext context) + => entityTypeBuilder.ToTable( + entityTypeBuilder.Metadata.GetTableName().ToLowerInvariant(), + entityTypeBuilder.Metadata.GetSchema()); public override void ProcessPropertyAdded( IConventionPropertyBuilder propertyBuilder, diff --git a/EFCore.NamingConventions/NamingConventions/Internal/NamingConvention.cs b/EFCore.NamingConventions/NamingConventions/Internal/NamingConvention.cs index 7c79f7f..2ab3a25 100644 --- a/EFCore.NamingConventions/NamingConventions/Internal/NamingConvention.cs +++ b/EFCore.NamingConventions/NamingConventions/Internal/NamingConvention.cs @@ -4,6 +4,6 @@ namespace EFCore.NamingConventions.Internal { None, SnakeCase, - AllLowerCase, + LowerCase } } diff --git a/EFCore.NamingConventions/NamingConventions/Internal/NamingConventionSetPlugin.cs b/EFCore.NamingConventions/NamingConventions/Internal/NamingConventionSetPlugin.cs index eca5648..6d4f35b 100644 --- a/EFCore.NamingConventions/NamingConventions/Internal/NamingConventionSetPlugin.cs +++ b/EFCore.NamingConventions/NamingConventions/Internal/NamingConventionSetPlugin.cs @@ -22,7 +22,7 @@ namespace EFCore.NamingConventions.Internal NameRewriterBase nameRewriter = namingStyle switch { NamingConvention.SnakeCase => new SnakeCaseNameRewriter(), - NamingConvention.AllLowerCase => new LowerCaseNameRewriter(), + NamingConvention.LowerCase => new LowerCaseNameRewriter(), _ => throw new NotImplementedException("Unhandled enum value: " + namingStyle) }; diff --git a/EFCore.NamingConventions/NamingConventions/Internal/NamingConventionsOptionsExtension.cs b/EFCore.NamingConventions/NamingConventions/Internal/NamingConventionsOptionsExtension.cs index f9754f3..4648f4d 100644 --- a/EFCore.NamingConventions/NamingConventions/Internal/NamingConventionsOptionsExtension.cs +++ b/EFCore.NamingConventions/NamingConventions/Internal/NamingConventionsOptionsExtension.cs @@ -40,7 +40,7 @@ namespace EFCore.NamingConventions.Internal public virtual NamingConventionsOptionsExtension WithLowerCaseNamingConvention() { var clone = Clone(); - clone._namingConvention = NamingConvention.AllLowerCase; + clone._namingConvention = NamingConvention.LowerCase; return clone; } @@ -64,14 +64,14 @@ namespace EFCore.NamingConventions.Internal => _logFragment ??= Extension._namingConvention switch { NamingConvention.SnakeCase => "using snake-case naming ", - NamingConvention.AllLowerCase => "using lower case naming", + NamingConvention.LowerCase => "using lower case naming", _ => "" }; public override long GetServiceProviderHashCode() => Extension._namingConvention.GetHashCode(); public override void PopulateDebugInfo(IDictionary debugInfo) - => debugInfo["Naming:" + nameof(NamingConventionsOptionsExtension)] + => debugInfo["Naming:UseNamingConvention"] = Extension._namingConvention.GetHashCode().ToString(CultureInfo.InvariantCulture); } }