Ticket #9 : Support user defined type

Author: habarthierry-hue

Directory.Build.props

@@ -1,6 +1,6 @@
 <Project>
     <PropertyGroup>
-        <VersionPrefix>2.0.1</VersionPrefix>
+        <VersionPrefix>2.0.2</VersionPrefix>
         <Authors>SimpleIdServer</Authors>
         <Owners>SimpleIdServer</Owners>
     </PropertyGroup>

samples/EFCore.Cassandra.Samples/FakeDbContext.cs

@@ -38,6 +38,9 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
             modelBuilder.Entity<CV>()
                 .ToTable("cvs", "cv")
                 .HasKey(c => c.Id);
+            modelBuilder.Entity<ApplicantAddress>()
+                .ToUserDefinedType("applicant_addr", "cv")
+                .HasNoKey();
         }
     }
 }

…20200616081423_InitialCreate.Designer.cs …20200917124959_InitialCreate.Designer.cssamples/EFCore.Cassandra.Samples/Migrations/20200616081423_InitialCreate.Designer.cs renamed to samples/EFCore.Cassandra.Samples/Migrations/20200917124959_InitialCreate.Designer.cs samples/EFCore.Cassandra.Samples/Migrations/20200616081423_InitialCreate.Designer.cs renamed to samples/EFCore.Cassandra.Samples/Migrations/20200917124959_InitialCreate.Designer.cs

@@ -3,6 +3,7 @@
 using System.Net;
 using System.Numerics;
 using Cassandra;
+using EFCore.Cassandra.Samples.Models;
 using Microsoft.EntityFrameworkCore.Migrations;
 
 namespace EFCore.Cassandra.Samples.Migrations
@@ -40,7 +41,8 @@ protected override void Up(MigrationBuilder migrationBuilder)
                     LocalTime = table.Column<LocalTime>(nullable: true),
                     Lst = table.Column<IEnumerable<string>>(nullable: true),
                     LstInt = table.Column<IEnumerable<int>>(nullable: true),
-                    Dic = table.Column<IDictionary<string, string>>(nullable: true)
+                    Dic = table.Column<IDictionary<string, string>>(nullable: true),
+                    Address = table.Column<ApplicantAddress>(type: "applicant_addr", nullable: true)
                 },
                 constraints: table =>
                 {
@@ -60,6 +62,15 @@ protected override void Up(MigrationBuilder migrationBuilder)
                 {
                     table.PrimaryKey("PK_cvs", x => x.Id);
                 });
+
+            migrationBuilder.CreateUserDefinedType(
+                name: "applicant_addr",
+                schema: "cv",
+                columns: table => new
+                {
+                    City = table.Column<string>(nullable: true),
+                    StreetNumber = table.Column<int>(nullable: false)
+                });
         }
 
         protected override void Down(MigrationBuilder migrationBuilder)
@@ -71,6 +82,10 @@ protected override void Down(MigrationBuilder migrationBuilder)
             migrationBuilder.DropTable(
                 name: "cvs",
                 schema: "cv");
+
+            migrationBuilder.DropUserDefinedType(
+                name: "applicant_addr",
+                schema: "cv");
         }
     }
 }

…grations/20200616081423_InitialCreate.cs …grations/20200917124959_InitialCreate.cssamples/EFCore.Cassandra.Samples/Migrations/20200616081423_InitialCreate.cs renamed to samples/EFCore.Cassandra.Samples/Migrations/20200917124959_InitialCreate.cs samples/EFCore.Cassandra.Samples/Migrations/20200616081423_InitialCreate.cs renamed to samples/EFCore.Cassandra.Samples/Migrations/20200917124959_InitialCreate.cs

@@ -99,6 +99,19 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.HasAnnotation("Cassandra:ClusteringOrderByOptions", "[{\"ColumnName\":\"Order\",\"Order\":0}]");
                 });
 
+            modelBuilder.Entity("EFCore.Cassandra.Samples.Models.ApplicantAddress", b =>
+                {
+                    b.Property<string>("City")
+                        .HasColumnType("text");
+
+                    b.Property<int>("StreetNumber")
+                        .HasColumnType("int");
+
+                    b.ToTable("applicant_addr","cv");
+
+                    b.HasAnnotation("Cassandra:IsUserDefinedType", true);
+                });
+
             modelBuilder.Entity("EFCore.Cassandra.Samples.Models.CV", b =>
                 {
                     b.Property<Guid>("Id")

samples/EFCore.Cassandra.Samples/Migrations/FakeDbContextModelSnapshot.cs

@@ -32,5 +32,6 @@ public class Applicant
         public IList<string> Lst { get; set; }
         public IList<int> LstInt { get; set; }
         public IDictionary<string, string> Dic { get; set; }
+        public ApplicantAddress Address { get; set; }
     }
 }

samples/EFCore.Cassandra.Samples/Models/Applicant.cs

@@ -0,0 +1,8 @@
+namespace EFCore.Cassandra.Samples.Models
+{
+    public class ApplicantAddress
+    {
+        public int StreetNumber { get; set; }
+        public string City { get; set; }
+    }
+}

samples/EFCore.Cassandra.Samples/Models/ApplicantAddress.cs

@@ -98,7 +98,12 @@ private static Applicant BuildApplicant()
                 Blob = new byte[] { 1, 2 },
                 LocalDate = new LocalDate(2019, 10, 2),
                 Ip = IPAddress.Loopback,
-                LocalTime = new LocalTime(2, 3, 4, 5)
+                LocalTime = new LocalTime(2, 3, 4, 5),
+                Address = new ApplicantAddress
+                {
+                    City = "Brussels",
+                    StreetNumber = 100
+                }
             };
         }
     }

samples/EFCore.Cassandra.Samples/Program.cs

@@ -13,6 +13,7 @@
 using Microsoft.EntityFrameworkCore.Diagnostics;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Migrations.Internal;
 using Microsoft.EntityFrameworkCore.Query;
 using Microsoft.EntityFrameworkCore.Storage;
 using Microsoft.EntityFrameworkCore.Update;
@@ -27,11 +28,13 @@ public static IServiceCollection AddEntityFrameworkCassandra(this IServiceCollec
                 .TryAdd<IDatabaseProvider, DatabaseProvider<CassandraOptionsExtension>>()
                 .TryAdd<IRelationalTypeMappingSource, CassandraTypeMappingSource>()
                 .TryAdd<LoggingDefinitions, CassandraLoggingDefinitions>()
+                .TryAdd<IMigrationsModelDiffer, CassandraMigrationsModelDiffer>()
                 // .TryAdd<IMemberTranslator, CassandraCompositeMemberTranslator>()
                 .TryAdd<IMigrator, CassandraMigrator>()
                 .TryAdd<ISqlGenerationHelper, CassandraSqlGenerationHelper>()
                 .TryAdd<IMigrationsSqlGenerator, CassandraMigrationsSqlGenerator>()
                 .TryAdd<IRelationalDatabaseCreator, CassandraDatabaseCreator>()
+                .TryAdd<IModelValidator, CassandraModelValidator>()
                 .TryAdd<IMigrationCommandExecutor, CassandraMigrationCommandExecutor>()
                 .TryAdd<IModificationCommandBatchFactory, CassandraModificationCommandBatchFactory>()
                 .TryAdd<IDatabaseCreator, CassandraDatabaseCreator>()

src/EFCore.Cassandra/CassandraServiceCollectionExtensions.cs

@@ -1,14 +1,13 @@
 // Copyright (c) SimpleIdServer. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
-using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Linq.Expressions;
 using System.Reflection;
 
-namespace Microsoft.EntityFrameworkCore.Cassandra
+namespace System
 {
-    public static class SharedTypeExtensions
+    public static class CassandraSharedTypeExtensions
     {
         public static Expression UnwrapTypeConversion(this Expression expression, out Type convertedType)
         {
@@ -27,6 +26,9 @@ public static Expression UnwrapTypeConversion(this Expression expression, out Ty
             return expression;
         }
 
+        public static bool IsValidEntityType(this Type type)
+            => type.GetTypeInfo().IsClass;
+
         public static Type UnwrapNullableType(this Type type) => Nullable.GetUnderlyingType(type) ?? type;
 
         public static bool IsInteger(this Type type)
@@ -162,5 +164,24 @@ public static IEnumerable<Type> GetBaseTypes(this Type type)
                 type = type.GetTypeInfo().BaseType;
             }
         }
+
+        public static IEnumerable<PropertyInfo> GetPropertiesInHierarchy(this Type type, string name)
+        {
+            do
+            {
+                var typeInfo = type.GetTypeInfo();
+                foreach (var propertyInfo in typeInfo.DeclaredProperties)
+                {
+                    if (propertyInfo.Name.Equals(name, StringComparison.Ordinal)
+                        && !(propertyInfo.GetMethod ?? propertyInfo.SetMethod).IsStatic)
+                    {
+                        yield return propertyInfo;
+                    }
+                }
+
+                type = typeInfo.BaseType;
+            }
+            while (type != null);
+        }
     }
 }