Ticket #7 : Fix 'add-migration' error

habarthierry-hue · habarthierry-hue · commit 427770984133 · 2020-06-16T10:16:31.000+02:00
diff --git a/samples/EFCore.Cassandra.Samples/FakeDbContext.cs b/samples/EFCore.Cassandra.Samples/FakeDbContext.cs
@@ -27,7 +27,8 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
                 .ToTable("applicants", "cv")
                 .HasKey(p => new { p.Id, p.Order });
             modelBuilder.Entity<Applicant>()
-                .ForCassandraSetClusterColumns(s => new { s.Order });
+                .ForCassandraSetClusterColumns(_ => _.Order)
+                .ForCassandraSetClusteringOrderBy(new[] { new CassandraClusteringOrderByOption("Order", CassandraClusteringOrderByOptions.ASC) });
             modelBuilder.Entity<Applicant>()
                .Property(p => p.TimeUuid)
                .HasConversion(new TimeUuidToGuidConverter());
diff --git a/samples/EFCore.Cassandra.Samples/Migrations/20200616081423_InitialCreate.Designer.cs b/samples/EFCore.Cassandra.Samples/Migrations/20200616081423_InitialCreate.Designer.cs
diff --git a/samples/EFCore.Cassandra.Samples/Migrations/20200616081423_InitialCreate.cs b/samples/EFCore.Cassandra.Samples/Migrations/20200616081423_InitialCreate.cs
@@ -7,7 +7,7 @@
 
 namespace EFCore.Cassandra.Samples.Migrations
 {
-    public partial class Init : Migration
+    public partial class InitialCreate : Migration
     {
         protected override void Up(MigrationBuilder migrationBuilder)
         {
diff --git a/samples/EFCore.Cassandra.Samples/Migrations/FakeDbContextModelSnapshot.cs b/samples/EFCore.Cassandra.Samples/Migrations/FakeDbContextModelSnapshot.cs
@@ -95,6 +95,8 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.ToTable("applicants","cv");
 
                     b.HasAnnotation("Cassandra:ClusterColumns", new[] { "Order" });
+
+                    b.HasAnnotation("Cassandra:ClusteringOrderByOptions", "[{\"ColumnName\":\"Order\",\"Order\":0}]");
                 });
 
             modelBuilder.Entity("EFCore.Cassandra.Samples.Models.CV", b =>
diff --git a/src/EFCore.Cassandra/Extensions/CassandraEntityTypeExtensions.cs b/src/EFCore.Cassandra/Extensions/CassandraEntityTypeExtensions.cs
@@ -2,6 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
 using Microsoft.EntityFrameworkCore.Cassandra.Metadata.Internal;
 using Microsoft.EntityFrameworkCore.Metadata;
+using Newtonsoft.Json;
 using System.Collections.Generic;
 
 namespace Microsoft.EntityFrameworkCore
@@ -38,7 +39,7 @@ public static IEnumerable<CassandraClusteringOrderByOption> GetClusteringOrderBy
                 return new CassandraClusteringOrderByOption[0];
             }
 
-            return (IEnumerable<CassandraClusteringOrderByOption>)result.Value;
+            return JsonConvert.DeserializeObject<IEnumerable<CassandraClusteringOrderByOption>>(result.Value.ToString());
         }
 
         public static void SetClusterColumns(this IMutableEntityType entityType, IEnumerable<string> clusterColumns)
@@ -53,7 +54,8 @@ public static void SetStaticColumns(this IMutableEntityType entityType, IEnumera
 
         public static void SetClusteringOrderByOptions(this IMutableEntityType entityType, IEnumerable<CassandraClusteringOrderByOption> options)
         {
-            entityType.SetOrRemoveAnnotation(CassandraAnnotationNames.ClusteringOrderByOptions, options);
+            var json = JsonConvert.SerializeObject(options);
+            entityType.SetOrRemoveAnnotation(CassandraAnnotationNames.ClusteringOrderByOptions, json);
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`
`8`	`8`	`namespace EFCore.Cassandra.Samples.Migrations`
`9`	`9`	`{`
`10`		`- public partial class Init : Migration`
	`10`	`+ public partial class InitialCreate : Migration`
`11`	`11`	`{`
`12`	`12`	`protected override void Up(MigrationBuilder migrationBuilder)`
`13`	`13`	`{`
Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@`
`2`	`2`	`// Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.`
`3`	`3`	`using Microsoft.EntityFrameworkCore.Cassandra.Metadata.Internal;`
`4`	`4`	`using Microsoft.EntityFrameworkCore.Metadata;`
	`5`	`+using Newtonsoft.Json;`
`5`	`6`	`using System.Collections.Generic;`
`6`	`7`
`7`	`8`	`namespace Microsoft.EntityFrameworkCore`
`@@ -38,7 +39,7 @@ public static IEnumerable<CassandraClusteringOrderByOption> GetClusteringOrderBy`
`38`	`39`	`return new CassandraClusteringOrderByOption[0];`
`39`	`40`	`}`
`40`	`41`
`41`		`- return (IEnumerable<CassandraClusteringOrderByOption>)result.Value;`
	`42`	`+ return JsonConvert.DeserializeObject<IEnumerable<CassandraClusteringOrderByOption>>(result.Value.ToString());`
`42`	`43`	`}`
`43`	`44`
`44`	`45`	`public static void SetClusterColumns(this IMutableEntityType entityType, IEnumerable<string> clusterColumns)`
`@@ -53,7 +54,8 @@ public static void SetStaticColumns(this IMutableEntityType entityType, IEnumera`
`53`	`54`
`54`	`55`	`public static void SetClusteringOrderByOptions(this IMutableEntityType entityType, IEnumerable<CassandraClusteringOrderByOption> options)`
`55`	`56`	`{`
`56`		`- entityType.SetOrRemoveAnnotation(CassandraAnnotationNames.ClusteringOrderByOptions, options);`
	`57`	`+ var json = JsonConvert.SerializeObject(options);`
	`58`	`+ entityType.SetOrRemoveAnnotation(CassandraAnnotationNames.ClusteringOrderByOptions, json);`
`57`	`59`	`}`
`58`	`60`	`}`
`59`	`61`	`}`