update to use EFCore.NamingConventions for snake_case db properties

npgsql/efcore.pg#933 efcore/EFCore.NamingConventions#1
williamdenton · Sep 22, 2019 · 7d2ef0b · 7d2ef0b
1 parent 941bd35
commit 7d2ef0b
Show file tree

Hide file tree

Showing 7 changed files with 96 additions and 91 deletions.
diff --git a/src/AwsRdsPostgresDemo/AwsRdsPostgresDemo.csproj b/src/AwsRdsPostgresDemo/AwsRdsPostgresDemo.csproj
@@ -7,9 +7,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="AWSSDK.RDS" Version="3.3.108.3" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="3.0.0-preview9.19423.6" />
-    <PackageReference Include="Microsoft.Extensions.Hosting" Version="3.0.0-preview9.19423.4" />
+    <PackageReference Include="AWSSDK.RDS" Version="3.3.110" />
+    <PackageReference Include="EFCore.NamingConventions" Version="1.0.0-rc1" />
+    <PackageReference Include="Microsoft.Extensions.Hosting" Version="3.0.0-rc1.19456.10" />
     <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="3.0.0-preview9" />
     <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL.NodaTime" Version="3.0.0-preview9" /> 
   </ItemGroup>
@@ -20,7 +20,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="3.0.0-preview9.19423.6">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="3.0.0-rc1.19456.14">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>

diff --git a/src/AwsRdsPostgresDemo/Migrations/20190922075424_snake_case.Designer.cs b/src/AwsRdsPostgresDemo/Migrations/20190922075424_snake_case.Designer.cs
diff --git a/src/AwsRdsPostgresDemo/Migrations/20190922075424_snake_case.cs b/src/AwsRdsPostgresDemo/Migrations/20190922075424_snake_case.cs
@@ -0,0 +1,31 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+namespace WilliamDenton.AwsRdsPostgresDemo.Migrations
+{
+	public partial class snake_case : Migration
+	{
+		protected override void Up(MigrationBuilder migrationBuilder)
+		{
+			// migrationBuilder.DropPrimaryKey(
+			//     name: "pk_customers",
+			//     table: "customers");
+
+			// migrationBuilder.AddPrimaryKey(
+			//     name: "PK_customers",
+			//     table: "customers",
+			//     column: "id");
+		}
+
+		protected override void Down(MigrationBuilder migrationBuilder)
+		{
+			// migrationBuilder.DropPrimaryKey(
+			//     name: "PK_customers",
+			//     table: "customers");
+
+			// migrationBuilder.AddPrimaryKey(
+			//     name: "pk_customers",
+			//     table: "customers",
+			//     column: "id");
+		}
+	}
+}
diff --git a/src/AwsRdsPostgresDemo/Migrations/DemoMigratorDbContextModelSnapshot.cs b/src/AwsRdsPostgresDemo/Migrations/DemoMigratorDbContextModelSnapshot.cs
@@ -16,7 +16,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
 #pragma warning disable 612, 618
             modelBuilder
                 .HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn)
-                .HasAnnotation("ProductVersion", "3.0.0-preview9.19423.6")
+                .HasAnnotation("ProductVersion", "3.0.0-rc1.19456.14")
                 .HasAnnotation("Relational:MaxIdentifierLength", 63);
 
             modelBuilder.Entity("WilliamDenton.AwsRdsPostgresDemo.Models.Customer", b =>
@@ -41,8 +41,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .HasColumnType("character varying(100)")
                         .HasMaxLength(100);
 
-                    b.HasKey("Id")
-                        .HasName("pk_customers");
+                    b.HasKey("Id");
 
                     b.HasIndex("CustomerCode")
                         .IsUnique();

diff --git a/src/AwsRdsPostgresDemo/Models/DemoDbContext.cs b/src/AwsRdsPostgresDemo/Models/DemoDbContext.cs
@@ -12,7 +12,6 @@ protected DemoDbContext(DbContextOptions options) : base(options) { }
 		protected override void OnModelCreating(ModelBuilder modelBuilder)
 		{
 			base.OnModelCreating(modelBuilder);
-			modelBuilder.UseSnakeCaseNames();
 
 			modelBuilder.Entity<Customer>()
 				.HasIndex(payment => payment.CustomerCode)

diff --git a/src/AwsRdsPostgresDemo/Models/ModelBuilderExtensions.cs b/src/AwsRdsPostgresDemo/Models/ModelBuilderExtensions.cs
diff --git a/src/AwsRdsPostgresDemo/Program.cs b/src/AwsRdsPostgresDemo/Program.cs
@@ -65,6 +65,7 @@ static void ConfigureDbContextOptions(DbContextOptionsBuilder efOptions, string
 					npgsqlOptions.UseAwsIamAuthentication();
 					npgsqlOptions.UseNodaTime();
 				});
+				efOptions.UseSnakeCaseNamingConventions();
 			}
 			services.AddScoped<IDemoReadWriteDbContext>(provider => provider.GetService<DemoReadWriteDbContext>());
 			services.AddScoped<IDemoReadOnlyDbContext>(provider => provider.GetService<DemoReadOnlyDbContext>());