From e464cf88608b7e805241b01eb95ab82559fe0582 Mon Sep 17 00:00:00 2001 From: Andriy Svyryd Date: Fri, 22 Dec 2023 14:55:54 -0800 Subject: [PATCH] Preserve unicodeness and fixed-lengthness in compiled model. Fixes #32617 --- .../Internal/CosmosSingletonOptions.cs | 2 - ...nalCSharpRuntimeAnnotationCodeGenerator.cs | 22 ++- .../Internal/SqlServerStringTypeMapping.cs | 4 +- .../CosmosConcurrencyTest.cs | 95 +--------- .../MaterializationInterceptionCosmosTest.cs | 28 +-- .../TestUtilities/CosmosTestStoreFactory.cs | 3 +- ...MaterializationInterceptionInMemoryTest.cs | 30 +-- .../TestUtilities/InMemoryTestStore.cs | 2 +- .../MaterializationInterceptionTestBase.cs | 57 +++--- .../NonSharedModelTestBase.cs | 37 ++-- .../ServiceProviderFixtureBase.cs | 1 - .../SharedStoreFixtureBase.cs | 2 +- .../SingletonInterceptorsTestBase.cs | 48 ++--- .../TestUtilities/DataGenerator`.cs | 14 ++ .../TestUtilities/DataGenerator``.cs | 14 ++ ...aterializationInterceptionSqlServerTest.cs | 33 +--- .../BigModel/DbContextModelBuilder.cs | 4 +- .../BigModel/DependentDerivedEntityType.cs | 1 + .../Baselines/BigModel/ManyTypesEntityType.cs | 179 +++++++++++++++++- .../BigModel/OwnedType0EntityType.cs | 13 ++ .../Baselines/BigModel/OwnedTypeEntityType.cs | 13 ++ .../BigModel/PrincipalBaseEntityType.cs | 12 ++ .../DbContextModelBuilder.cs | 4 +- .../DependentDerivedEntityType.cs | 1 + .../ManyTypesEntityType.cs | 179 +++++++++++++++++- .../OwnedType0EntityType.cs | 13 ++ .../OwnedTypeEntityType.cs | 13 ++ .../PrincipalBaseEntityType.cs | 13 ++ .../ComplexTypes/PrincipalBaseEntityType.cs | 37 ++++ ...ParameterTypeMappingContextModelBuilder.cs | 1 + .../FunctionTypeMappingContextModelBuilder.cs | 1 + .../DbFunctionContextModelBuilder.cs | 4 + .../Baselines/Tpc/PrincipalBaseEntityType.cs | 12 ++ .../Scaffolding/CompiledModelSqlServerTest.cs | 14 ++ .../MaterializationInterceptionSqliteTest.cs | 30 +-- 35 files changed, 652 insertions(+), 284 deletions(-) create mode 100644 test/EFCore.Specification.Tests/TestUtilities/DataGenerator`.cs create mode 100644 test/EFCore.Specification.Tests/TestUtilities/DataGenerator``.cs diff --git a/src/EFCore.Cosmos/Infrastructure/Internal/CosmosSingletonOptions.cs b/src/EFCore.Cosmos/Infrastructure/Internal/CosmosSingletonOptions.cs index 7199e61540d..dd911b7206c 100644 --- a/src/EFCore.Cosmos/Infrastructure/Internal/CosmosSingletonOptions.cs +++ b/src/EFCore.Cosmos/Infrastructure/Internal/CosmosSingletonOptions.cs @@ -169,7 +169,6 @@ public virtual void Initialize(IDbContextOptions options) Region = cosmosOptions.Region; PreferredRegions = cosmosOptions.PreferredRegions; LimitToEndpoint = cosmosOptions.LimitToEndpoint; - EnableContentResponseOnWrite = cosmosOptions.EnableContentResponseOnWrite; ConnectionMode = cosmosOptions.ConnectionMode; WebProxy = cosmosOptions.WebProxy; RequestTimeout = cosmosOptions.RequestTimeout; @@ -208,7 +207,6 @@ public virtual void Validate(IDbContextOptions options) || GatewayModeMaxConnectionLimit != cosmosOptions.GatewayModeMaxConnectionLimit || MaxTcpConnectionsPerEndpoint != cosmosOptions.MaxTcpConnectionsPerEndpoint || MaxRequestsPerTcpConnection != cosmosOptions.MaxRequestsPerTcpConnection - || EnableContentResponseOnWrite != cosmosOptions.EnableContentResponseOnWrite || HttpClientFactory != cosmosOptions.HttpClientFactory )) { diff --git a/src/EFCore.Relational/Design/Internal/RelationalCSharpRuntimeAnnotationCodeGenerator.cs b/src/EFCore.Relational/Design/Internal/RelationalCSharpRuntimeAnnotationCodeGenerator.cs index bd763e8a2f4..b013b53e209 100644 --- a/src/EFCore.Relational/Design/Internal/RelationalCSharpRuntimeAnnotationCodeGenerator.cs +++ b/src/EFCore.Relational/Design/Internal/RelationalCSharpRuntimeAnnotationCodeGenerator.cs @@ -2154,7 +2154,15 @@ public override bool Create( && relationalTypeMapping.Scale != defaultInstance.Scale; var dbTypeDifferent = relationalTypeMapping.DbType != null && relationalTypeMapping.DbType != defaultInstance.DbType; - if (storeTypeDifferent || sizeDifferent || precisionDifferent || scaleDifferent || dbTypeDifferent) + var isUnicodeDifferent = relationalTypeMapping.IsUnicode != defaultInstance.IsUnicode; + var isFixedLengthDifferent = relationalTypeMapping.IsFixedLength != defaultInstance.IsFixedLength; + if (storeTypeDifferent + || sizeDifferent + || precisionDifferent + || scaleDifferent + || dbTypeDifferent + || isUnicodeDifferent + || isFixedLengthDifferent) { AddNamespace(typeof(RelationalTypeMappingInfo), parameters.Namespaces); mainBuilder.AppendLine(",") @@ -2174,6 +2182,18 @@ public override bool Create( "size", code.Literal(relationalTypeMapping.Size), mainBuilder, ref firstParameter); } + if (isUnicodeDifferent) + { + GenerateArgument( + "unicode", code.Literal(relationalTypeMapping.IsUnicode), mainBuilder, ref firstParameter); + } + + if (isFixedLengthDifferent) + { + GenerateArgument( + "fixedLength", code.Literal(relationalTypeMapping.IsFixedLength), mainBuilder, ref firstParameter); + } + if (precisionDifferent) { GenerateArgument( diff --git a/src/EFCore.SqlServer/Storage/Internal/SqlServerStringTypeMapping.cs b/src/EFCore.SqlServer/Storage/Internal/SqlServerStringTypeMapping.cs index c3e2bc07838..7d3d6f724e0 100644 --- a/src/EFCore.SqlServer/Storage/Internal/SqlServerStringTypeMapping.cs +++ b/src/EFCore.SqlServer/Storage/Internal/SqlServerStringTypeMapping.cs @@ -68,9 +68,7 @@ public SqlServerStringTypeMapping( private static string GetDefaultStoreName(bool unicode, bool fixedLength) => unicode ? fixedLength ? "nchar" : "nvarchar" - : fixedLength - ? "char" - : "varchar"; + : fixedLength ? "char" : "varchar"; private static DbType? GetDbType(bool unicode, bool fixedLength) => unicode diff --git a/test/EFCore.Cosmos.FunctionalTests/CosmosConcurrencyTest.cs b/test/EFCore.Cosmos.FunctionalTests/CosmosConcurrencyTest.cs index 13ff8a1f95c..6d07397dcac 100644 --- a/test/EFCore.Cosmos.FunctionalTests/CosmosConcurrencyTest.cs +++ b/test/EFCore.Cosmos.FunctionalTests/CosmosConcurrencyTest.cs @@ -45,91 +45,21 @@ public virtual Task Updating_then_updating_the_same_entity_results_in_DbUpdateCo ctx => ctx.Customers.Single(c => c.Id == "3").Name = "Updated", ctx => ctx.Customers.Single(c => c.Id == "3").Name = "Updated"); - [ConditionalFact] - public async Task Etag_will_return_when_content_response_enabled_false() - { - await using var testDatabase = CosmosTestStore.CreateInitialized( - DatabaseName, - o => o.ContentResponseOnWriteEnabled(false)); - - var customer = new Customer - { - Id = "4", Name = "Theon", - }; - - await using (var context = new ConcurrencyContext(CreateOptions(testDatabase))) - { - await context.Database.EnsureCreatedAsync(); - - await context.AddAsync(customer); - - await context.SaveChangesAsync(); - } - - await using (var context = new ConcurrencyContext(CreateOptions(testDatabase))) - { - var customerFromStore = await context.Set().SingleAsync(); - - Assert.Equal(customer.Id, customerFromStore.Id); - Assert.Equal("Theon", customerFromStore.Name); - Assert.Equal(customer.ETag, customerFromStore.ETag); - - context.Remove(customerFromStore); - - await context.SaveChangesAsync(); - } - } - - [ConditionalFact] - public async Task Etag_will_return_when_content_response_enabled_true() - { - await using var testDatabase = CosmosTestStore.CreateInitialized( - DatabaseName, - o => o.ContentResponseOnWriteEnabled()); - - var customer = new Customer - { - Id = "3", Name = "Theon", - }; - - await using (var context = new ConcurrencyContext(CreateOptions(testDatabase))) - { - await context.Database.EnsureCreatedAsync(); - - await context.AddAsync(customer); - - await context.SaveChangesAsync(); - } - - await using (var context = new ConcurrencyContext(CreateOptions(testDatabase))) - { - var customerFromStore = await context.Set().SingleAsync(); - - Assert.Equal(customer.Id, customerFromStore.Id); - Assert.Equal("Theon", customerFromStore.Name); - Assert.Equal(customer.ETag, customerFromStore.ETag); - - context.Remove(customerFromStore); - - await context.SaveChangesAsync(); - } - } - [ConditionalTheory] [InlineData(null)] [InlineData(true)] [InlineData(false)] public async Task Etag_is_updated_in_entity_after_SaveChanges(bool? contentResponseOnWriteEnabled) { - await using var testDatabase = CosmosTestStore.CreateInitialized( - DatabaseName, - o => + var options = new DbContextOptionsBuilder(Fixture.CreateOptions()) + .UseCosmos(o => { - if (contentResponseOnWriteEnabled.HasValue) + if (contentResponseOnWriteEnabled != null) { o.ContentResponseOnWriteEnabled(contentResponseOnWriteEnabled.Value); } - }); + }) + .Options; var customer = new Customer { @@ -139,10 +69,9 @@ public async Task Etag_is_updated_in_entity_after_SaveChanges(bool? contentRespo }; string etag = null; - - await using (var context = new ConcurrencyContext(CreateOptions(testDatabase))) + await using (var context = new ConcurrencyContext(options)) { - await context.Database.EnsureCreatedAsync(); + await Fixture.TestStore.CleanAsync(context); await context.AddAsync(customer); @@ -151,7 +80,7 @@ public async Task Etag_is_updated_in_entity_after_SaveChanges(bool? contentRespo etag = customer.ETag; } - await using (var context = new ConcurrencyContext(CreateOptions(testDatabase))) + await using (var context = new ConcurrencyContext(options)) { var customerFromStore = await context.Set().SingleAsync(); @@ -208,7 +137,7 @@ protected virtual async Task ConcurrencyTestAsync( where TException : DbUpdateException { using var outerContext = CreateContext(); - await outerContext.Database.EnsureCreatedAsync(); + await Fixture.TestStore.CleanAsync(outerContext); seedAction?.Invoke(outerContext); await outerContext.SaveChangesAsync(); @@ -258,12 +187,6 @@ protected override void OnModelCreating(ModelBuilder builder) }); } - private DbContextOptions CreateOptions(CosmosTestStore testDatabase) - => testDatabase.AddProviderOptions(new DbContextOptionsBuilder()) - .ConfigureWarnings(w => w.Ignore(CoreEventId.ManyServiceProvidersCreatedWarning)) - .EnableDetailedErrors() - .Options; - public class Customer { public string Id { get; set; } diff --git a/test/EFCore.Cosmos.FunctionalTests/MaterializationInterceptionCosmosTest.cs b/test/EFCore.Cosmos.FunctionalTests/MaterializationInterceptionCosmosTest.cs index 2a946ff3ba5..d6dfce95d62 100644 --- a/test/EFCore.Cosmos.FunctionalTests/MaterializationInterceptionCosmosTest.cs +++ b/test/EFCore.Cosmos.FunctionalTests/MaterializationInterceptionCosmosTest.cs @@ -4,15 +4,9 @@ namespace Microsoft.EntityFrameworkCore; public class MaterializationInterceptionCosmosTest : - MaterializationInterceptionTestBase, - IClassFixture + MaterializationInterceptionTestBase { - public MaterializationInterceptionCosmosTest(MaterializationInterceptionCosmosFixture fixture) - : base(fixture) - { - } - - public override Task Intercept_query_materialization_with_owned_types_projecting_collection(bool async) + public override Task Intercept_query_materialization_with_owned_types_projecting_collection(bool async, bool usePooling) => Task.CompletedTask; public class CosmosLibraryContext : LibraryContext @@ -30,20 +24,6 @@ protected override void OnModelCreating(ModelBuilder modelBuilder) } } - public override LibraryContext CreateContext(IEnumerable interceptors, bool inject) - => new CosmosLibraryContext(Fixture.CreateOptions(interceptors, inject)); - - public class MaterializationInterceptionCosmosFixture : SingletonInterceptorsFixtureBase - { - protected override string StoreName - => "MaterializationInterception"; - - protected override ITestStoreFactory TestStoreFactory - => CosmosTestStoreFactory.Instance; - - protected override IServiceCollection InjectInterceptors( - IServiceCollection serviceCollection, - IEnumerable injectedInterceptors) - => base.InjectInterceptors(serviceCollection.AddEntityFrameworkCosmos(), injectedInterceptors); - } + protected override ITestStoreFactory TestStoreFactory + => CosmosTestStoreFactory.Instance; } diff --git a/test/EFCore.Cosmos.FunctionalTests/TestUtilities/CosmosTestStoreFactory.cs b/test/EFCore.Cosmos.FunctionalTests/TestUtilities/CosmosTestStoreFactory.cs index b0a4f175603..91a4a49c8ca 100644 --- a/test/EFCore.Cosmos.FunctionalTests/TestUtilities/CosmosTestStoreFactory.cs +++ b/test/EFCore.Cosmos.FunctionalTests/TestUtilities/CosmosTestStoreFactory.cs @@ -14,8 +14,7 @@ protected CosmosTestStoreFactory() public IServiceCollection AddProviderServices(IServiceCollection serviceCollection) => serviceCollection .AddEntityFrameworkCosmos() - .AddSingleton(new TestSqlLoggerFactory()) - .AddSingleton(); + .AddSingleton(new TestSqlLoggerFactory()); public TestStore Create(string storeName) => CosmosTestStore.Create(storeName); diff --git a/test/EFCore.InMemory.FunctionalTests/MaterializationInterceptionInMemoryTest.cs b/test/EFCore.InMemory.FunctionalTests/MaterializationInterceptionInMemoryTest.cs index 2174fe56ac0..949007c814c 100644 --- a/test/EFCore.InMemory.FunctionalTests/MaterializationInterceptionInMemoryTest.cs +++ b/test/EFCore.InMemory.FunctionalTests/MaterializationInterceptionInMemoryTest.cs @@ -6,14 +6,8 @@ namespace Microsoft.EntityFrameworkCore; public class MaterializationInterceptionInMemoryTest : - MaterializationInterceptionTestBase, - IClassFixture + MaterializationInterceptionTestBase { - public MaterializationInterceptionInMemoryTest(MaterializationInterceptionInMemoryFixture fixture) - : base(fixture) - { - } - public class InMemoryLibraryContext : LibraryContext { public InMemoryLibraryContext(DbContextOptions options) @@ -29,23 +23,9 @@ protected override void OnModelCreating(ModelBuilder modelBuilder) } } - public override LibraryContext CreateContext(IEnumerable interceptors, bool inject) - => new InMemoryLibraryContext(Fixture.CreateOptions(interceptors, inject)); - - public class MaterializationInterceptionInMemoryFixture : SingletonInterceptorsFixtureBase - { - protected override string StoreName - => "MaterializationInterception"; - - protected override ITestStoreFactory TestStoreFactory - => InMemoryTestStoreFactory.Instance; + protected override ITestStoreFactory TestStoreFactory + => InMemoryTestStoreFactory.Instance; - protected override IServiceCollection InjectInterceptors( - IServiceCollection serviceCollection, - IEnumerable injectedInterceptors) - => base.InjectInterceptors(serviceCollection.AddEntityFrameworkInMemoryDatabase(), injectedInterceptors); - - public override DbContextOptionsBuilder AddOptions(DbContextOptionsBuilder builder) - => base.AddOptions(builder).ConfigureWarnings(c => c.Ignore(InMemoryEventId.TransactionIgnoredWarning)); - } + protected override DbContextOptionsBuilder AddOptions(DbContextOptionsBuilder builder) + => base.AddOptions(builder).ConfigureWarnings(c => c.Ignore(InMemoryEventId.TransactionIgnoredWarning)); } diff --git a/test/EFCore.InMemory.FunctionalTests/TestUtilities/InMemoryTestStore.cs b/test/EFCore.InMemory.FunctionalTests/TestUtilities/InMemoryTestStore.cs index 6395480dc94..c7da403ad4e 100644 --- a/test/EFCore.InMemory.FunctionalTests/TestUtilities/InMemoryTestStore.cs +++ b/test/EFCore.InMemory.FunctionalTests/TestUtilities/InMemoryTestStore.cs @@ -39,7 +39,7 @@ public InMemoryTestStore InitializeInMemory( protected override TestStoreIndex GetTestStoreIndex(IServiceProvider serviceProvider) => serviceProvider == null ? base.GetTestStoreIndex(null) - : serviceProvider.GetRequiredService(); + : serviceProvider.GetService() ?? base.GetTestStoreIndex(serviceProvider); public override DbContextOptionsBuilder AddProviderOptions(DbContextOptionsBuilder builder) => builder.UseInMemoryDatabase(Name); diff --git a/test/EFCore.Specification.Tests/MaterializationInterceptionTestBase.cs b/test/EFCore.Specification.Tests/MaterializationInterceptionTestBase.cs index 608617e9f90..52a3d9f792b 100644 --- a/test/EFCore.Specification.Tests/MaterializationInterceptionTestBase.cs +++ b/test/EFCore.Specification.Tests/MaterializationInterceptionTestBase.cs @@ -6,17 +6,14 @@ namespace Microsoft.EntityFrameworkCore; public abstract class MaterializationInterceptionTestBase : SingletonInterceptorsTestBase - where TContext : DbContext + where TContext : SingletonInterceptorsTestBase.LibraryContext { - protected MaterializationInterceptionTestBase(SingletonInterceptorsFixtureBase fixture) - : base(fixture) - { - } + protected override string StoreName + => "MaterializationInterception"; [ConditionalTheory] - [InlineData(false)] - [InlineData(true)] - public virtual void Binding_interceptors_are_used_by_queries(bool inject) + [ClassData(typeof(DataGenerator))] + public virtual void Binding_interceptors_are_used_by_queries(bool inject, bool usePooling) { var interceptors = new[] { @@ -26,7 +23,7 @@ public virtual void Binding_interceptors_are_used_by_queries(bool inject) new TestBindingInterceptor("4") }; - using var context = CreateContext(interceptors, inject); + using var context = CreateContext(interceptors, inject, usePooling); context.AddRange( new Book { Title = "Amiga ROM Kernel Reference Manual" }, @@ -41,9 +38,8 @@ public virtual void Binding_interceptors_are_used_by_queries(bool inject) } [ConditionalTheory] - [InlineData(false)] - [InlineData(true)] - public virtual void Binding_interceptors_are_used_when_creating_instances(bool inject) + [ClassData(typeof(DataGenerator))] + public virtual void Binding_interceptors_are_used_when_creating_instances(bool inject, bool usePooling) { var interceptors = new[] { @@ -53,7 +49,7 @@ public virtual void Binding_interceptors_are_used_when_creating_instances(bool i new TestBindingInterceptor("4") }; - using var context = CreateContext(interceptors, inject); + using var context = CreateContext(interceptors, inject, usePooling); var materializer = context.GetService(); var book = (Book)materializer.GetEmptyMaterializer(context.Model.FindEntityType(typeof(Book))!)( @@ -64,9 +60,8 @@ public virtual void Binding_interceptors_are_used_when_creating_instances(bool i } [ConditionalTheory] - [InlineData(false)] - [InlineData(true)] - public virtual void Intercept_query_materialization_for_empty_constructor(bool inject) + [ClassData(typeof(DataGenerator))] + public virtual void Intercept_query_materialization_for_empty_constructor(bool inject, bool usePooling) { var creatingInstanceCount = 0; var createdInstanceCount = 0; @@ -135,7 +130,7 @@ public virtual void Intercept_query_materialization_for_empty_constructor(bool i }) }; - using (context = CreateContext(interceptors, inject)) + using (context = CreateContext(interceptors, inject, usePooling)) { var books = new[] { @@ -173,9 +168,8 @@ public virtual void Intercept_query_materialization_for_empty_constructor(bool i private static int _id; [ConditionalTheory] // Issue #30244 - [InlineData(false)] - [InlineData(true)] - public virtual async Task Intercept_query_materialization_with_owned_types(bool async) + [ClassData(typeof(DataGenerator))] + public virtual async Task Intercept_query_materialization_with_owned_types(bool async, bool usePooling) { var creatingInstanceCounts = new Dictionary(); var createdInstanceCounts = new Dictionary(); @@ -219,7 +213,7 @@ public virtual async Task Intercept_query_materialization_with_owned_types(bool }) }; - using (context = CreateContext(interceptors, inject: true)) + using (context = CreateContext(interceptors, inject: true, usePooling)) { context.Add( new TestEntity30244 @@ -262,9 +256,8 @@ public virtual async Task Intercept_query_materialization_with_owned_types(bool } [ConditionalTheory] // Issue #31365 - [InlineData(false)] - [InlineData(true)] - public virtual async Task Intercept_query_materialization_with_owned_types_projecting_collection(bool async) + [ClassData(typeof(DataGenerator))] + public virtual async Task Intercept_query_materialization_with_owned_types_projecting_collection(bool async, bool usePooling) { var creatingInstanceCounts = new Dictionary(); var createdInstanceCounts = new Dictionary(); @@ -308,7 +301,7 @@ public virtual async Task Intercept_query_materialization_with_owned_types_proje }) }; - using (context = CreateContext(interceptors, inject: true)) + using (context = CreateContext(interceptors, inject: true, usePooling)) { context.Add( new TestEntity30244 @@ -353,9 +346,8 @@ public virtual async Task Intercept_query_materialization_with_owned_types_proje } [ConditionalTheory] - [InlineData(false)] - [InlineData(true)] - public virtual void Intercept_query_materialization_for_full_constructor(bool inject) + [ClassData(typeof(DataGenerator))] + public virtual void Intercept_query_materialization_for_full_constructor(bool inject, bool usePooling) { var creatingInstanceCount = 0; var createdInstanceCount = 0; @@ -424,7 +416,7 @@ public virtual void Intercept_query_materialization_for_full_constructor(bool in }) }; - using (context = CreateContext(interceptors, inject)) + using (context = CreateContext(interceptors, inject, usePooling)) { var pamphlets = new[] { new Pamphlet(Guid.Empty, "Rights of Man"), new Pamphlet(Guid.Empty, "Pamphlet des pamphlets") }; @@ -457,9 +449,8 @@ public virtual void Intercept_query_materialization_for_full_constructor(bool in } [ConditionalTheory] - [InlineData(false)] - [InlineData(true)] - public virtual void Multiple_materialization_interceptors_can_be_used(bool inject) + [ClassData(typeof(DataGenerator))] + public virtual void Multiple_materialization_interceptors_can_be_used(bool inject, bool usePooling) { var interceptors = new ISingletonInterceptor[] { @@ -472,7 +463,7 @@ public virtual void Multiple_materialization_interceptors_can_be_used(bool injec new CountingMaterializationInterceptor("C") }; - using var context = CreateContext(interceptors, inject); + using var context = CreateContext(interceptors, inject, usePooling); context.AddRange( new Book { Title = "Amiga ROM Kernel Reference Manual" }, diff --git a/test/EFCore.Specification.Tests/NonSharedModelTestBase.cs b/test/EFCore.Specification.Tests/NonSharedModelTestBase.cs index 50f2dc48880..f2acfd643da 100644 --- a/test/EFCore.Specification.Tests/NonSharedModelTestBase.cs +++ b/test/EFCore.Specification.Tests/NonSharedModelTestBase.cs @@ -8,7 +8,7 @@ namespace Microsoft.EntityFrameworkCore; public abstract class NonSharedModelTestBase : IDisposable, IAsyncLifetime { - public static IEnumerable IsAsyncData = new[] { new object[] { false }, new object[] { true } }; + public static IEnumerable IsAsyncData = new object[][] { [false], [true] }; protected abstract string StoreName { get; } protected abstract ITestStoreFactory TestStoreFactory { get; } @@ -42,11 +42,12 @@ protected virtual ContextFactory Initialize( Action seed = null, Func shouldLogCategory = null, Func createTestStore = null, - bool usePooling = true) + bool usePooling = true, + bool useServiceProvider = true) where TContext : DbContext { var contextFactory = CreateContextFactory( - onModelCreating, onConfiguring, addServices, shouldLogCategory, createTestStore, usePooling); + onModelCreating, onConfiguring, addServices, shouldLogCategory, createTestStore, usePooling, useServiceProvider); TestStore.Initialize(_serviceProvider, contextFactory.CreateContext, seed == null ? null : c => seed((TContext)c)); @@ -62,11 +63,12 @@ protected virtual Task> InitializeAsync( Action seed = null, Func shouldLogCategory = null, Func createTestStore = null, - bool usePooling = true) + bool usePooling = true, + bool useServiceProvider = true) where TContext : DbContext { var contextFactory = CreateContextFactory( - onModelCreating, onConfiguring, addServices, shouldLogCategory, createTestStore, usePooling); + onModelCreating, onConfiguring, addServices, shouldLogCategory, createTestStore, usePooling, useServiceProvider); TestStore.Initialize(_serviceProvider, contextFactory.CreateContext, seed == null ? null : c => seed((TContext)c)); @@ -81,14 +83,17 @@ protected ContextFactory CreateContextFactory( Func addServices = null, Func shouldLogCategory = null, Func createTestStore = null, - bool usePooling = true) + bool usePooling = true, + bool useServiceProvider = true) where TContext : DbContext { _testStore = createTestStore?.Invoke() ?? CreateTestStore(); shouldLogCategory ??= _ => false; - var services = TestStoreFactory.AddProviderServices(new ServiceCollection()) - .AddSingleton(TestStoreFactory.CreateListLoggerFactory(shouldLogCategory)); + var services = (useServiceProvider + ? TestStoreFactory.AddProviderServices(new ServiceCollection()) + : new ServiceCollection()) + .AddSingleton(TestStoreFactory.CreateListLoggerFactory(shouldLogCategory)); if (onModelCreating != null) { @@ -98,10 +103,10 @@ protected ContextFactory CreateContextFactory( addServices?.Invoke(services); services = usePooling - ? services.AddDbContextPool(typeof(TContext), (s, b) => ConfigureOptions(s, b, onConfiguring)) + ? services.AddDbContextPool(typeof(TContext), (s, b) => ConfigureOptions(useServiceProvider ? s : null, b, onConfiguring)) : services.AddDbContext( typeof(TContext), - (s, b) => ConfigureOptions(s, b, onConfiguring), + (s, b) => ConfigureOptions(useServiceProvider ? s : null, b, onConfiguring), ServiceLifetime.Transient, ServiceLifetime.Singleton); @@ -115,8 +120,16 @@ private DbContextOptionsBuilder ConfigureOptions( DbContextOptionsBuilder optionsBuilder, Action onConfiguring) { - optionsBuilder = AddOptions(TestStore.AddProviderOptions(optionsBuilder)) - .UseInternalServiceProvider(serviceProvider); + optionsBuilder = AddOptions(TestStore.AddProviderOptions(optionsBuilder)); + if (serviceProvider == null) + { + optionsBuilder.EnableServiceProviderCaching(false); + } + else + { + optionsBuilder.UseInternalServiceProvider(serviceProvider); + } + onConfiguring?.Invoke(optionsBuilder); return optionsBuilder; } diff --git a/test/EFCore.Specification.Tests/ServiceProviderFixtureBase.cs b/test/EFCore.Specification.Tests/ServiceProviderFixtureBase.cs index cc13d843ac4..d423885f58c 100644 --- a/test/EFCore.Specification.Tests/ServiceProviderFixtureBase.cs +++ b/test/EFCore.Specification.Tests/ServiceProviderFixtureBase.cs @@ -23,7 +23,6 @@ public DbContextOptions CreateOptions(TestStore testStore) => AddOptions(testStore.AddProviderOptions(new DbContextOptionsBuilder())) .EnableDetailedErrors() .UseInternalServiceProvider(ServiceProvider) - .EnableServiceProviderCaching(false) .Options; protected override IServiceCollection AddServices(IServiceCollection serviceCollection) diff --git a/test/EFCore.Specification.Tests/SharedStoreFixtureBase.cs b/test/EFCore.Specification.Tests/SharedStoreFixtureBase.cs index d79ce61cdb0..953f098cc18 100644 --- a/test/EFCore.Specification.Tests/SharedStoreFixtureBase.cs +++ b/test/EFCore.Specification.Tests/SharedStoreFixtureBase.cs @@ -62,7 +62,7 @@ public virtual Task InitializeAsync() _serviceProvider = services.BuildServiceProvider(validateScopes: true); - TestStore.Initialize(ServiceProvider, CreateContext, c => Seed((TContext)c), c => Clean(c)); + TestStore.Initialize(ServiceProvider, CreateContext, c => Seed((TContext)c), Clean); return Task.CompletedTask; } diff --git a/test/EFCore.Specification.Tests/SingletonInterceptorsTestBase.cs b/test/EFCore.Specification.Tests/SingletonInterceptorsTestBase.cs index 233c16a447a..3538cd10a87 100644 --- a/test/EFCore.Specification.Tests/SingletonInterceptorsTestBase.cs +++ b/test/EFCore.Specification.Tests/SingletonInterceptorsTestBase.cs @@ -7,16 +7,9 @@ namespace Microsoft.EntityFrameworkCore; -public abstract class SingletonInterceptorsTestBase - where TContext : DbContext +public abstract class SingletonInterceptorsTestBase : NonSharedModelTestBase + where TContext : SingletonInterceptorsTestBase.LibraryContext { - protected SingletonInterceptorsTestBase(SingletonInterceptorsFixtureBase fixture) - { - Fixture = fixture; - } - - protected SingletonInterceptorsFixtureBase Fixture { get; } - protected class Book { public Guid Id { get; set; } @@ -91,31 +84,26 @@ protected override void OnModelCreating(ModelBuilder modelBuilder) } } - public abstract LibraryContext CreateContext(IEnumerable interceptors, bool inject); - - public abstract class SingletonInterceptorsFixtureBase : SharedStoreFixtureBase + public TContext CreateContext(IEnumerable interceptors, bool inject, bool usePooling) { - public virtual DbContextOptions CreateOptions(IEnumerable interceptors, bool inject) - { - var optionsBuilder = inject - ? new DbContextOptionsBuilder().UseInternalServiceProvider( - InjectInterceptors(new ServiceCollection(), interceptors) - .BuildServiceProvider(validateScopes: true)) - : new DbContextOptionsBuilder().AddInterceptors(interceptors); + var contextFactory = base.Initialize( + onConfiguring: inject ? null : o => o.AddInterceptors(interceptors), + addServices: inject ? s => InjectInterceptors(s, interceptors) : null, + usePooling: usePooling, + useServiceProvider: inject); - return AddOptions(TestStore.AddProviderOptions(optionsBuilder)).EnableDetailedErrors().Options; - } + return contextFactory.CreateContext(); + } - protected virtual IServiceCollection InjectInterceptors( - IServiceCollection serviceCollection, - IEnumerable injectedInterceptors) + protected virtual IServiceCollection InjectInterceptors( + IServiceCollection serviceCollection, + IEnumerable injectedInterceptors) + { + foreach (var interceptor in injectedInterceptors) { - foreach (var interceptor in injectedInterceptors) - { - serviceCollection.AddSingleton(interceptor); - } - - return serviceCollection; + serviceCollection.AddSingleton(interceptor); } + + return serviceCollection; } } diff --git a/test/EFCore.Specification.Tests/TestUtilities/DataGenerator`.cs b/test/EFCore.Specification.Tests/TestUtilities/DataGenerator`.cs new file mode 100644 index 00000000000..21b225c9c20 --- /dev/null +++ b/test/EFCore.Specification.Tests/TestUtilities/DataGenerator`.cs @@ -0,0 +1,14 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. + +using System.Collections; + +namespace Microsoft.EntityFrameworkCore.TestUtilities; + +public class DataGenerator : IEnumerable +{ + public IEnumerator GetEnumerator() => + DataGenerator.GetCombinations(typeof(T)).AsEnumerable().GetEnumerator(); + + IEnumerator IEnumerable.GetEnumerator() => GetEnumerator(); +} diff --git a/test/EFCore.Specification.Tests/TestUtilities/DataGenerator``.cs b/test/EFCore.Specification.Tests/TestUtilities/DataGenerator``.cs new file mode 100644 index 00000000000..00f5917b903 --- /dev/null +++ b/test/EFCore.Specification.Tests/TestUtilities/DataGenerator``.cs @@ -0,0 +1,14 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. + +using System.Collections; + +namespace Microsoft.EntityFrameworkCore.TestUtilities; + +public class DataGenerator : IEnumerable +{ + public IEnumerator GetEnumerator() => + DataGenerator.GetCombinations(typeof(T1), typeof(T2)).AsEnumerable().GetEnumerator(); + + IEnumerator IEnumerable.GetEnumerator() => GetEnumerator(); +} diff --git a/test/EFCore.SqlServer.FunctionalTests/MaterializationInterceptionSqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/MaterializationInterceptionSqlServerTest.cs index a22eafddba9..e51a1b69d84 100644 --- a/test/EFCore.SqlServer.FunctionalTests/MaterializationInterceptionSqlServerTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/MaterializationInterceptionSqlServerTest.cs @@ -8,14 +8,8 @@ namespace Microsoft.EntityFrameworkCore; public class MaterializationInterceptionSqlServerTest : - MaterializationInterceptionTestBase, - IClassFixture + MaterializationInterceptionTestBase { - public MaterializationInterceptionSqlServerTest(MaterializationInterceptionSqlServerFixture fixture) - : base(fixture) - { - } - public class SqlServerLibraryContext : LibraryContext { public SqlServerLibraryContext(DbContextOptions options) @@ -31,27 +25,6 @@ protected override void OnModelCreating(ModelBuilder modelBuilder) } } - public override LibraryContext CreateContext(IEnumerable interceptors, bool inject) - => new SqlServerLibraryContext(Fixture.CreateOptions(interceptors, inject)); - - public class MaterializationInterceptionSqlServerFixture : SingletonInterceptorsFixtureBase - { - protected override string StoreName - => "MaterializationInterception"; - - protected override ITestStoreFactory TestStoreFactory - => SqlServerTestStoreFactory.Instance; - - protected override IServiceCollection InjectInterceptors( - IServiceCollection serviceCollection, - IEnumerable injectedInterceptors) - => base.InjectInterceptors(serviceCollection.AddEntityFrameworkSqlServer(), injectedInterceptors); - - public override DbContextOptionsBuilder AddOptions(DbContextOptionsBuilder builder) - { - new SqlServerDbContextOptionsBuilder(base.AddOptions(builder)) - .ExecutionStrategy(d => new SqlServerExecutionStrategy(d)); - return builder; - } - } + protected override ITestStoreFactory TestStoreFactory + => SqlServerTestStoreFactory.Instance; } diff --git a/test/EFCore.SqlServer.FunctionalTests/Scaffolding/Baselines/BigModel/DbContextModelBuilder.cs b/test/EFCore.SqlServer.FunctionalTests/Scaffolding/Baselines/BigModel/DbContextModelBuilder.cs index ece83409fb8..3f577144b7b 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Scaffolding/Baselines/BigModel/DbContextModelBuilder.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Scaffolding/Baselines/BigModel/DbContextModelBuilder.cs @@ -203,7 +203,7 @@ private IRelationalModel CreateRelationalModel() microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("Char", charColumnBase); var charArrayColumnBase = new ColumnBase("CharArray", "nvarchar(max)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase); microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("CharArray", charArrayColumnBase); - var charToStringConverterPropertyColumnBase = new ColumnBase("CharToStringConverterProperty", "nvarchar(1)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase); + var charToStringConverterPropertyColumnBase = new ColumnBase("CharToStringConverterProperty", "nchar(1)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase); microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("CharToStringConverterProperty", charToStringConverterPropertyColumnBase); var dateOnlyColumnBase = new ColumnBase("DateOnly", "date", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase); microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("DateOnly", dateOnlyColumnBase); @@ -1044,7 +1044,7 @@ private IRelationalModel CreateRelationalModel() manyTypesTable.Columns.Add("Char", charColumn); var charArrayColumn = new Column("CharArray", "nvarchar(max)", manyTypesTable); manyTypesTable.Columns.Add("CharArray", charArrayColumn); - var charToStringConverterPropertyColumn = new Column("CharToStringConverterProperty", "nvarchar(1)", manyTypesTable); + var charToStringConverterPropertyColumn = new Column("CharToStringConverterProperty", "nchar(1)", manyTypesTable); manyTypesTable.Columns.Add("CharToStringConverterProperty", charToStringConverterPropertyColumn); var dateOnlyColumn = new Column("DateOnly", "date", manyTypesTable); manyTypesTable.Columns.Add("DateOnly", dateOnlyColumn); diff --git a/test/EFCore.SqlServer.FunctionalTests/Scaffolding/Baselines/BigModel/DependentDerivedEntityType.cs b/test/EFCore.SqlServer.FunctionalTests/Scaffolding/Baselines/BigModel/DependentDerivedEntityType.cs index a9a9348ce6f..bc3c7e5d733 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Scaffolding/Baselines/BigModel/DependentDerivedEntityType.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Scaffolding/Baselines/BigModel/DependentDerivedEntityType.cs @@ -48,6 +48,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "char(20)", size: 20, + fixedLength: true, dbType: System.Data.DbType.AnsiStringFixedLength)); data.AddAnnotation("Relational:IsFixedLength", true); data.AddAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.None); diff --git a/test/EFCore.SqlServer.FunctionalTests/Scaffolding/Baselines/BigModel/ManyTypesEntityType.cs b/test/EFCore.SqlServer.FunctionalTests/Scaffolding/Baselines/BigModel/ManyTypesEntityType.cs index eec96037a75..03df4d23893 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Scaffolding/Baselines/BigModel/ManyTypesEntityType.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Scaffolding/Baselines/BigModel/ManyTypesEntityType.cs @@ -106,6 +106,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonCollectionReaderWriter( JsonBoolReaderWriter.Instance)), @@ -148,6 +149,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(1)", size: 1, + unicode: true, dbType: System.Data.DbType.String), converter: new ValueConverter( (bool v) => (string)(v ? "B" : "A"), @@ -262,6 +264,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonCollectionReaderWriter( JsonByteArrayReaderWriter.Instance)), @@ -308,6 +311,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new ValueConverter( (Byte[] v) => Convert.ToBase64String(v), @@ -371,6 +375,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(1)", size: 1, + unicode: true, dbType: System.Data.DbType.String), converter: new ValueConverter( (char v) => string.Format(CultureInfo.InvariantCulture, "{0}", (object)v), @@ -403,6 +408,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonCollectionReaderWriter( new JsonConvertedValueReaderWriter( @@ -433,6 +439,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(1)", size: 1, + unicode: true, dbType: System.Data.DbType.String), converter: new ValueConverter( (char v) => string.Format(CultureInfo.InvariantCulture, "{0}", (object)v), @@ -464,9 +471,11 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v.GetHashCode(), (string v) => v), mappingInfo: new RelationalTypeMappingInfo( - storeTypeName: "nvarchar(1)", + storeTypeName: "nchar(1)", size: 1, - dbType: System.Data.DbType.String), + unicode: true, + fixedLength: true, + dbType: System.Data.DbType.StringFixedLength), converter: new ValueConverter( (char v) => string.Format(CultureInfo.InvariantCulture, "{0}", (object)v), (string v) => v.Length < 1 ? '\0' : v[0]), @@ -476,6 +485,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (char v) => string.Format(CultureInfo.InvariantCulture, "{0}", (object)v), (string v) => v.Length < 1 ? '\0' : v[0]))); charToStringConverterProperty.SetSentinelFromProviderValue("\0"); + charToStringConverterProperty.AddAnnotation("Relational:IsFixedLength", true); charToStringConverterProperty.AddAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.None); var dateOnly = runtimeEntityType.AddProperty( @@ -519,6 +529,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonCollectionReaderWriter( JsonDateOnlyReaderWriter.Instance)), @@ -562,6 +573,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(10)", size: 10, + unicode: true, dbType: System.Data.DbType.String), converter: new ValueConverter( (DateOnly v) => v.ToString("yyyy\\-MM\\-dd"), @@ -615,6 +627,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonCollectionReaderWriter( JsonDateTimeReaderWriter.Instance)), @@ -721,6 +734,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(48)", size: 48, + unicode: true, dbType: System.Data.DbType.String), converter: new ValueConverter( (DateTimeOffset v) => v.ToString("yyyy\\-MM\\-dd HH\\:mm\\:ss.FFFFFFFzzz"), @@ -785,6 +799,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(48)", size: 48, + unicode: true, dbType: System.Data.DbType.String), converter: new ValueConverter( (DateTime v) => v.ToString("yyyy\\-MM\\-dd HH\\:mm\\:ss.FFFFFFF"), @@ -859,6 +874,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonCollectionReaderWriter( JsonDecimalReaderWriter.Instance)), @@ -935,6 +951,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(64)", size: 64, + unicode: true, dbType: System.Data.DbType.String), converter: new ValueConverter( (decimal v) => string.Format(CultureInfo.InvariantCulture, "{0}", (object)v), @@ -988,6 +1005,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonCollectionReaderWriter( JsonDoubleReaderWriter.Instance)), @@ -1064,6 +1082,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(64)", size: 64, + unicode: true, dbType: System.Data.DbType.String), converter: new ValueConverter( (double v) => string.Format(CultureInfo.InvariantCulture, "{0:R}", (object)v), @@ -1125,6 +1144,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonCollectionReaderWriter( new JsonConvertedValueReaderWriter( @@ -1183,6 +1203,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new ValueConverter( (CompiledModelTestBase.Enum16 v) => v.ToString(), @@ -1216,6 +1237,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonCollectionReaderWriter( new JsonConvertedValueReaderWriter( @@ -1245,6 +1267,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new ValueConverter( (CompiledModelTestBase.Enum16 v) => v.ToString(), @@ -1277,6 +1300,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonCollectionReaderWriter, List, CompiledModelTestBase.Enum16>( new JsonConvertedValueReaderWriter( @@ -1306,6 +1330,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new ValueConverter( (CompiledModelTestBase.Enum16 v) => v.ToString(), @@ -1338,6 +1363,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonCollectionReaderWriter, List, CompiledModelTestBase.Enum16>( new JsonConvertedValueReaderWriter( @@ -1424,6 +1450,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonCollectionReaderWriter( new JsonConvertedValueReaderWriter( @@ -1482,6 +1509,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new ValueConverter( (CompiledModelTestBase.Enum32 v) => v.ToString(), @@ -1515,6 +1543,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonCollectionReaderWriter( new JsonConvertedValueReaderWriter( @@ -1544,6 +1573,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new ValueConverter( (CompiledModelTestBase.Enum32 v) => v.ToString(), @@ -1576,6 +1606,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonCollectionReaderWriter, List, CompiledModelTestBase.Enum32>( new JsonConvertedValueReaderWriter( @@ -1605,6 +1636,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new ValueConverter( (CompiledModelTestBase.Enum32 v) => v.ToString(), @@ -1637,6 +1669,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonCollectionReaderWriter, List, CompiledModelTestBase.Enum32>( new JsonConvertedValueReaderWriter( @@ -1723,6 +1756,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonCollectionReaderWriter( new JsonConvertedValueReaderWriter( @@ -1781,6 +1815,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new ValueConverter( (CompiledModelTestBase.Enum64 v) => v.ToString(), @@ -1814,6 +1849,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonCollectionReaderWriter( new JsonConvertedValueReaderWriter( @@ -1843,6 +1879,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new ValueConverter( (CompiledModelTestBase.Enum64 v) => v.ToString(), @@ -1875,6 +1912,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonCollectionReaderWriter, List, CompiledModelTestBase.Enum64>( new JsonConvertedValueReaderWriter( @@ -1904,6 +1942,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new ValueConverter( (CompiledModelTestBase.Enum64 v) => v.ToString(), @@ -1936,6 +1975,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonCollectionReaderWriter, List, CompiledModelTestBase.Enum64>( new JsonConvertedValueReaderWriter( @@ -2022,6 +2062,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonCollectionReaderWriter( new JsonConvertedValueReaderWriter( @@ -2080,6 +2121,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new ValueConverter( (CompiledModelTestBase.Enum8 v) => v.ToString(), @@ -2113,6 +2155,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonCollectionReaderWriter( new JsonConvertedValueReaderWriter( @@ -2142,6 +2185,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new ValueConverter( (CompiledModelTestBase.Enum8 v) => v.ToString(), @@ -2174,6 +2218,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonCollectionReaderWriter, List, CompiledModelTestBase.Enum8>( new JsonConvertedValueReaderWriter( @@ -2203,6 +2248,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new ValueConverter( (CompiledModelTestBase.Enum8 v) => v.ToString(), @@ -2235,6 +2281,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonCollectionReaderWriter, List, CompiledModelTestBase.Enum8>( new JsonConvertedValueReaderWriter( @@ -2323,6 +2370,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new ValueConverter( (CompiledModelTestBase.Enum32 v) => v.ToString(), @@ -2385,6 +2433,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonCollectionReaderWriter( new JsonConvertedValueReaderWriter( @@ -2443,6 +2492,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new ValueConverter( (CompiledModelTestBase.EnumU16 v) => v.ToString(), @@ -2476,6 +2526,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonCollectionReaderWriter( new JsonConvertedValueReaderWriter( @@ -2505,6 +2556,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new ValueConverter( (CompiledModelTestBase.EnumU16 v) => v.ToString(), @@ -2537,6 +2589,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonCollectionReaderWriter, List, CompiledModelTestBase.EnumU16>( new JsonConvertedValueReaderWriter( @@ -2566,6 +2619,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new ValueConverter( (CompiledModelTestBase.EnumU16 v) => v.ToString(), @@ -2598,6 +2652,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonCollectionReaderWriter, List, CompiledModelTestBase.EnumU16>( new JsonConvertedValueReaderWriter( @@ -2684,6 +2739,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonCollectionReaderWriter( new JsonConvertedValueReaderWriter( @@ -2742,6 +2798,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new ValueConverter( (CompiledModelTestBase.EnumU32 v) => v.ToString(), @@ -2775,6 +2832,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonCollectionReaderWriter( new JsonConvertedValueReaderWriter( @@ -2804,6 +2862,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new ValueConverter( (CompiledModelTestBase.EnumU32 v) => v.ToString(), @@ -2836,6 +2895,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonCollectionReaderWriter, List, CompiledModelTestBase.EnumU32>( new JsonConvertedValueReaderWriter( @@ -2865,6 +2925,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new ValueConverter( (CompiledModelTestBase.EnumU32 v) => v.ToString(), @@ -2897,6 +2958,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonCollectionReaderWriter, List, CompiledModelTestBase.EnumU32>( new JsonConvertedValueReaderWriter( @@ -2987,6 +3049,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonCollectionReaderWriter( new JsonConvertedValueReaderWriter( @@ -3049,6 +3112,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new ValueConverter( (CompiledModelTestBase.EnumU64 v) => v.ToString(), @@ -3082,6 +3146,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonCollectionReaderWriter( new JsonConvertedValueReaderWriter( @@ -3111,6 +3176,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new ValueConverter( (CompiledModelTestBase.EnumU64 v) => v.ToString(), @@ -3143,6 +3209,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonCollectionReaderWriter, List, CompiledModelTestBase.EnumU64>( new JsonConvertedValueReaderWriter( @@ -3172,6 +3239,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new ValueConverter( (CompiledModelTestBase.EnumU64 v) => v.ToString(), @@ -3204,6 +3272,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonCollectionReaderWriter, List, CompiledModelTestBase.EnumU64>( new JsonConvertedValueReaderWriter( @@ -3294,6 +3363,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonCollectionReaderWriter( new JsonConvertedValueReaderWriter( @@ -3352,6 +3422,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new ValueConverter( (CompiledModelTestBase.EnumU8 v) => v.ToString(), @@ -3385,6 +3456,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonCollectionReaderWriter( new JsonConvertedValueReaderWriter( @@ -3414,6 +3486,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new ValueConverter( (CompiledModelTestBase.EnumU8 v) => v.ToString(), @@ -3446,6 +3519,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonCollectionReaderWriter, List, CompiledModelTestBase.EnumU8>( new JsonConvertedValueReaderWriter( @@ -3475,6 +3549,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new ValueConverter( (CompiledModelTestBase.EnumU8 v) => v.ToString(), @@ -3507,6 +3582,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonCollectionReaderWriter, List, CompiledModelTestBase.EnumU8>( new JsonConvertedValueReaderWriter( @@ -3585,6 +3661,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonCollectionReaderWriter( JsonFloatReaderWriter.Instance)), @@ -3649,6 +3726,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonCollectionReaderWriter( JsonGuidReaderWriter.Instance)), @@ -3727,6 +3805,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(36)", size: 36, + unicode: true, dbType: System.Data.DbType.String), converter: new ValueConverter( (Guid v) => v.ToString("D"), @@ -3760,6 +3839,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(45)", size: 45, + unicode: true, dbType: System.Data.DbType.String), converter: new ValueConverter( (IPAddress v) => v.ToString(), @@ -3791,6 +3871,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonCollectionReaderWriter( new JsonConvertedValueReaderWriter( @@ -3821,6 +3902,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(45)", size: 45, + unicode: true, dbType: System.Data.DbType.String), converter: new ValueConverter( (IPAddress v) => v.ToString(), @@ -3886,6 +3968,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(45)", size: 45, + unicode: true, dbType: System.Data.DbType.String), converter: new ValueConverter( (IPAddress v) => v.ToString(), @@ -3938,6 +4021,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonCollectionReaderWriter( JsonInt16ReaderWriter.Instance)), @@ -4000,6 +4084,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonCollectionReaderWriter( JsonInt32ReaderWriter.Instance)), @@ -4062,6 +4147,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonCollectionReaderWriter( JsonInt64ReaderWriter.Instance)), @@ -4132,6 +4218,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonCollectionReaderWriter( new JsonConvertedValueReaderWriter( @@ -4224,6 +4311,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(64)", size: 64, + unicode: true, dbType: System.Data.DbType.String), converter: new ValueConverter( (int v) => string.Format(CultureInfo.InvariantCulture, "{0}", (object)v), @@ -4258,6 +4346,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new ValueConverter( (Nullable v) => v == null ? null : v.ToString(), @@ -4313,6 +4402,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonNullableStructCollectionReaderWriter( JsonBoolReaderWriter.Instance)), @@ -4378,6 +4468,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonCollectionReaderWriter( JsonByteArrayReaderWriter.Instance)), @@ -4424,6 +4515,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(1)", size: 1, + unicode: true, dbType: System.Data.DbType.String), converter: new ValueConverter( (char v) => string.Format(CultureInfo.InvariantCulture, "{0}", (object)v), @@ -4455,6 +4547,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonNullableStructCollectionReaderWriter( new JsonConvertedValueReaderWriter( @@ -4485,6 +4578,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(1)", size: 1, + unicode: true, dbType: System.Data.DbType.String), converter: new ValueConverter( (char v) => string.Format(CultureInfo.InvariantCulture, "{0}", (object)v), @@ -4537,6 +4631,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonNullableStructCollectionReaderWriter( JsonDateOnlyReaderWriter.Instance)), @@ -4599,6 +4694,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonNullableStructCollectionReaderWriter( JsonDateTimeReaderWriter.Instance)), @@ -4661,6 +4757,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonNullableStructCollectionReaderWriter( JsonDecimalReaderWriter.Instance)), @@ -4723,6 +4820,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonNullableStructCollectionReaderWriter( JsonDoubleReaderWriter.Instance)), @@ -4793,6 +4891,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonNullableStructCollectionReaderWriter( new JsonConvertedValueReaderWriter( @@ -4879,6 +4978,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonNullableStructCollectionReaderWriter( new JsonConvertedValueReaderWriter( @@ -4936,6 +5036,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonNullableStructCollectionReaderWriter, List, CompiledModelTestBase.Enum16>( new JsonConvertedValueReaderWriter( @@ -4993,6 +5094,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonNullableStructCollectionReaderWriter, List, CompiledModelTestBase.Enum16>( new JsonConvertedValueReaderWriter( @@ -5079,6 +5181,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonNullableStructCollectionReaderWriter( new JsonConvertedValueReaderWriter( @@ -5165,6 +5268,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonNullableStructCollectionReaderWriter( new JsonConvertedValueReaderWriter( @@ -5222,6 +5326,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonNullableStructCollectionReaderWriter, List, CompiledModelTestBase.Enum32>( new JsonConvertedValueReaderWriter( @@ -5279,6 +5384,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonNullableStructCollectionReaderWriter, List, CompiledModelTestBase.Enum32>( new JsonConvertedValueReaderWriter( @@ -5365,6 +5471,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonNullableStructCollectionReaderWriter( new JsonConvertedValueReaderWriter( @@ -5451,6 +5558,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonNullableStructCollectionReaderWriter( new JsonConvertedValueReaderWriter( @@ -5508,6 +5616,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonNullableStructCollectionReaderWriter, List, CompiledModelTestBase.Enum64>( new JsonConvertedValueReaderWriter( @@ -5565,6 +5674,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonNullableStructCollectionReaderWriter, List, CompiledModelTestBase.Enum64>( new JsonConvertedValueReaderWriter( @@ -5651,6 +5761,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonNullableStructCollectionReaderWriter( new JsonConvertedValueReaderWriter( @@ -5737,6 +5848,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonNullableStructCollectionReaderWriter( new JsonConvertedValueReaderWriter( @@ -5794,6 +5906,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonNullableStructCollectionReaderWriter, List, CompiledModelTestBase.Enum8>( new JsonConvertedValueReaderWriter( @@ -5851,6 +5964,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonNullableStructCollectionReaderWriter, List, CompiledModelTestBase.Enum8>( new JsonConvertedValueReaderWriter( @@ -5937,6 +6051,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonNullableStructCollectionReaderWriter( new JsonConvertedValueReaderWriter( @@ -6023,6 +6138,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonNullableStructCollectionReaderWriter( new JsonConvertedValueReaderWriter( @@ -6080,6 +6196,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonNullableStructCollectionReaderWriter, List, CompiledModelTestBase.EnumU16>( new JsonConvertedValueReaderWriter( @@ -6137,6 +6254,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonNullableStructCollectionReaderWriter, List, CompiledModelTestBase.EnumU16>( new JsonConvertedValueReaderWriter( @@ -6223,6 +6341,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonNullableStructCollectionReaderWriter( new JsonConvertedValueReaderWriter( @@ -6309,6 +6428,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonNullableStructCollectionReaderWriter( new JsonConvertedValueReaderWriter( @@ -6366,6 +6486,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonNullableStructCollectionReaderWriter, List, CompiledModelTestBase.EnumU32>( new JsonConvertedValueReaderWriter( @@ -6423,6 +6544,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonNullableStructCollectionReaderWriter, List, CompiledModelTestBase.EnumU32>( new JsonConvertedValueReaderWriter( @@ -6513,6 +6635,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonNullableStructCollectionReaderWriter( new JsonConvertedValueReaderWriter( @@ -6607,6 +6730,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonNullableStructCollectionReaderWriter( new JsonConvertedValueReaderWriter( @@ -6668,6 +6792,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonNullableStructCollectionReaderWriter, List, CompiledModelTestBase.EnumU64>( new JsonConvertedValueReaderWriter( @@ -6729,6 +6854,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonNullableStructCollectionReaderWriter, List, CompiledModelTestBase.EnumU64>( new JsonConvertedValueReaderWriter( @@ -6819,6 +6945,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonNullableStructCollectionReaderWriter( new JsonConvertedValueReaderWriter( @@ -6905,6 +7032,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonNullableStructCollectionReaderWriter( new JsonConvertedValueReaderWriter( @@ -6962,6 +7090,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonNullableStructCollectionReaderWriter, List, CompiledModelTestBase.EnumU8>( new JsonConvertedValueReaderWriter( @@ -7019,6 +7148,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonNullableStructCollectionReaderWriter, List, CompiledModelTestBase.EnumU8>( new JsonConvertedValueReaderWriter( @@ -7097,6 +7227,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonNullableStructCollectionReaderWriter( JsonFloatReaderWriter.Instance)), @@ -7161,6 +7292,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonNullableStructCollectionReaderWriter( JsonGuidReaderWriter.Instance)), @@ -7206,6 +7338,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(45)", size: 45, + unicode: true, dbType: System.Data.DbType.String), converter: new ValueConverter( (IPAddress v) => v.ToString(), @@ -7237,6 +7370,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonCollectionReaderWriter( new JsonConvertedValueReaderWriter( @@ -7267,6 +7401,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(45)", size: 45, + unicode: true, dbType: System.Data.DbType.String), converter: new ValueConverter( (IPAddress v) => v.ToString(), @@ -7319,6 +7454,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonNullableStructCollectionReaderWriter( JsonInt16ReaderWriter.Instance)), @@ -7381,6 +7517,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonNullableStructCollectionReaderWriter( JsonInt32ReaderWriter.Instance)), @@ -7443,6 +7580,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonNullableStructCollectionReaderWriter( JsonInt64ReaderWriter.Instance)), @@ -7513,6 +7651,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonNullableStructCollectionReaderWriter( new JsonConvertedValueReaderWriter( @@ -7572,6 +7711,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(20)", size: 20, + unicode: true, dbType: System.Data.DbType.String), converter: new ValueConverter( (PhysicalAddress v) => v.ToString(), @@ -7603,6 +7743,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonCollectionReaderWriter( new JsonConvertedValueReaderWriter( @@ -7633,6 +7774,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(20)", size: 20, + unicode: true, dbType: System.Data.DbType.String), converter: new ValueConverter( (PhysicalAddress v) => v.ToString(), @@ -7665,6 +7807,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), storeTypePostfix: StoreTypePostfix.None); nullableString.AddAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.None); @@ -7689,6 +7832,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonCollectionReaderWriter( JsonStringReaderWriter.Instance)), @@ -7710,6 +7854,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), storeTypePostfix: StoreTypePostfix.None)); nullableStringArray.AddAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.None); @@ -7755,6 +7900,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonNullableStructCollectionReaderWriter( JsonTimeOnlyReaderWriter.Instance)), @@ -7817,6 +7963,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonNullableStructCollectionReaderWriter( JsonTimeSpanReaderWriter.Instance)), @@ -7887,6 +8034,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonNullableStructCollectionReaderWriter( new JsonConvertedValueReaderWriter( @@ -7973,6 +8121,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonNullableStructCollectionReaderWriter( new JsonConvertedValueReaderWriter( @@ -8063,6 +8212,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonNullableStructCollectionReaderWriter( new JsonConvertedValueReaderWriter( @@ -8145,6 +8295,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonNullableStructCollectionReaderWriter( JsonByteReaderWriter.Instance)), @@ -8187,6 +8338,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new ValueConverter( (Uri v) => v.ToString(), @@ -8219,6 +8371,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonCollectionReaderWriter( new JsonConvertedValueReaderWriter( @@ -8248,6 +8401,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new ValueConverter( (Uri v) => v.ToString(), @@ -8281,6 +8435,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(20)", size: 20, + unicode: true, dbType: System.Data.DbType.String), converter: new ValueConverter( (PhysicalAddress v) => v.ToString(), @@ -8312,6 +8467,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonCollectionReaderWriter( new JsonConvertedValueReaderWriter( @@ -8342,6 +8498,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(20)", size: 20, + unicode: true, dbType: System.Data.DbType.String), converter: new ValueConverter( (PhysicalAddress v) => v.ToString(), @@ -8407,6 +8564,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(20)", size: 20, + unicode: true, dbType: System.Data.DbType.String), converter: new ValueConverter( (PhysicalAddress v) => v.ToString(), @@ -8438,6 +8596,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), storeTypePostfix: StoreTypePostfix.None); @string.AddAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.None); @@ -8462,6 +8621,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonCollectionReaderWriter( JsonStringReaderWriter.Instance)), @@ -8483,6 +8643,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), storeTypePostfix: StoreTypePostfix.None)); stringArray.AddAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.None); @@ -8570,6 +8731,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(1)", size: 1, + unicode: true, dbType: System.Data.DbType.String), converter: new ValueConverter( (string v) => string.Format(CultureInfo.InvariantCulture, "{0}", (object)(v.Length < 1 ? '\0' : v[0])), @@ -8785,6 +8947,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), storeTypePostfix: StoreTypePostfix.None); stringToGuidConverterProperty.AddAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.None); @@ -8903,6 +9066,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new ValueConverter( (string v) => new Uri(v, UriKind.RelativeOrAbsolute).ToString(), @@ -8956,6 +9120,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonCollectionReaderWriter( JsonTimeOnlyReaderWriter.Instance)), @@ -8999,6 +9164,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(48)", size: 48, + unicode: true, dbType: System.Data.DbType.String), converter: new ValueConverter( (TimeOnly v) => v.Ticks % 10000000L == 0L ? string.Format(CultureInfo.InvariantCulture, "{0:HH\\:mm\\:ss}", (object)v) : v.ToString("o"), @@ -9082,6 +9248,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonCollectionReaderWriter( JsonTimeSpanReaderWriter.Instance)), @@ -9125,6 +9292,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(48)", size: 48, + unicode: true, dbType: System.Data.DbType.String), converter: new ValueConverter( (TimeSpan v) => v.ToString("c"), @@ -9216,6 +9384,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonCollectionReaderWriter( new JsonConvertedValueReaderWriter( @@ -9302,6 +9471,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonCollectionReaderWriter( new JsonConvertedValueReaderWriter( @@ -9392,6 +9562,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonCollectionReaderWriter( new JsonConvertedValueReaderWriter( @@ -9497,6 +9668,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new ValueConverter( (Uri v) => v.ToString(), @@ -9529,6 +9701,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonCollectionReaderWriter( new JsonConvertedValueReaderWriter( @@ -9558,6 +9731,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new ValueConverter( (Uri v) => v.ToString(), @@ -9591,6 +9765,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new ValueConverter( (Uri v) => v.ToString(), diff --git a/test/EFCore.SqlServer.FunctionalTests/Scaffolding/Baselines/BigModel/OwnedType0EntityType.cs b/test/EFCore.SqlServer.FunctionalTests/Scaffolding/Baselines/BigModel/OwnedType0EntityType.cs index ce77f755a59..edf50c13228 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Scaffolding/Baselines/BigModel/OwnedType0EntityType.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Scaffolding/Baselines/BigModel/OwnedType0EntityType.cs @@ -115,6 +115,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), storeTypePostfix: StoreTypePostfix.None); details.AddAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.None); @@ -161,6 +162,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonCollectionReaderWriter( new JsonConvertedValueReaderWriter( @@ -191,6 +193,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(45)", size: 45, + unicode: true, dbType: System.Data.DbType.String), converter: new ValueConverter( (IPAddress v) => v.ToString(), @@ -223,6 +226,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonCollectionReaderWriter, List, string>( JsonStringReaderWriter.Instance)), @@ -244,6 +248,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), storeTypePostfix: StoreTypePostfix.None)); refTypeEnumerable.AddAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.None); @@ -269,6 +274,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonCollectionReaderWriter, List, string>( JsonStringReaderWriter.Instance)), @@ -290,6 +296,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), storeTypePostfix: StoreTypePostfix.None)); refTypeIList.AddAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.None); @@ -315,6 +322,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonCollectionReaderWriter, List, IPAddress>( new JsonConvertedValueReaderWriter( @@ -345,6 +353,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(45)", size: 45, + unicode: true, dbType: System.Data.DbType.String), converter: new ValueConverter( (IPAddress v) => v.ToString(), @@ -377,6 +386,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonCollectionReaderWriter( JsonDateTimeReaderWriter.Instance)), @@ -419,6 +429,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonCollectionReaderWriter, List, byte>( JsonByteReaderWriter.Instance)), @@ -461,6 +472,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonCollectionReaderWriter, List, byte>( JsonByteReaderWriter.Instance)), @@ -503,6 +515,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonCollectionReaderWriter, List, short>( JsonInt16ReaderWriter.Instance)), diff --git a/test/EFCore.SqlServer.FunctionalTests/Scaffolding/Baselines/BigModel/OwnedTypeEntityType.cs b/test/EFCore.SqlServer.FunctionalTests/Scaffolding/Baselines/BigModel/OwnedTypeEntityType.cs index df12a3cdabf..c6a1349fe3a 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Scaffolding/Baselines/BigModel/OwnedTypeEntityType.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Scaffolding/Baselines/BigModel/OwnedTypeEntityType.cs @@ -110,6 +110,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), storeTypePostfix: StoreTypePostfix.None); @@ -168,6 +169,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonCollectionReaderWriter( new JsonConvertedValueReaderWriter( @@ -198,6 +200,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(45)", size: 45, + unicode: true, dbType: System.Data.DbType.String), converter: new ValueConverter( (IPAddress v) => v.ToString(), @@ -231,6 +234,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonCollectionReaderWriter, List, string>( JsonStringReaderWriter.Instance)), @@ -252,6 +256,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), storeTypePostfix: StoreTypePostfix.None)); refTypeEnumerable.AddAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.None); @@ -278,6 +283,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonCollectionReaderWriter, List, string>( JsonStringReaderWriter.Instance)), @@ -299,6 +305,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), storeTypePostfix: StoreTypePostfix.None)); refTypeIList.AddAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.None); @@ -325,6 +332,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonCollectionReaderWriter, List, IPAddress>( new JsonConvertedValueReaderWriter( @@ -355,6 +363,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(45)", size: 45, + unicode: true, dbType: System.Data.DbType.String), converter: new ValueConverter( (IPAddress v) => v.ToString(), @@ -388,6 +397,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonCollectionReaderWriter( JsonDateTimeReaderWriter.Instance)), @@ -431,6 +441,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonCollectionReaderWriter, List, byte>( JsonByteReaderWriter.Instance)), @@ -474,6 +485,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonCollectionReaderWriter, List, byte>( JsonByteReaderWriter.Instance)), @@ -517,6 +529,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonCollectionReaderWriter, List, short>( JsonInt16ReaderWriter.Instance)), diff --git a/test/EFCore.SqlServer.FunctionalTests/Scaffolding/Baselines/BigModel/PrincipalBaseEntityType.cs b/test/EFCore.SqlServer.FunctionalTests/Scaffolding/Baselines/BigModel/PrincipalBaseEntityType.cs index c36cfba79bf..652a32b8a2d 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Scaffolding/Baselines/BigModel/PrincipalBaseEntityType.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Scaffolding/Baselines/BigModel/PrincipalBaseEntityType.cs @@ -227,6 +227,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonCollectionReaderWriter( new JsonConvertedValueReaderWriter( @@ -257,6 +258,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(45)", size: 45, + unicode: true, dbType: System.Data.DbType.String), converter: new ValueConverter( (IPAddress v) => v.ToString(), @@ -289,6 +291,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonCollectionReaderWriter, List, string>( JsonStringReaderWriter.Instance)), @@ -310,6 +313,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), storeTypePostfix: StoreTypePostfix.None)); refTypeEnumerable.AddAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.None); @@ -335,6 +339,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonCollectionReaderWriter, List, string>( JsonStringReaderWriter.Instance)), @@ -356,6 +361,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), storeTypePostfix: StoreTypePostfix.None)); refTypeIList.AddAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.None); @@ -381,6 +387,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonCollectionReaderWriter, List, IPAddress>( new JsonConvertedValueReaderWriter( @@ -411,6 +418,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(45)", size: 45, + unicode: true, dbType: System.Data.DbType.String), converter: new ValueConverter( (IPAddress v) => v.ToString(), @@ -443,6 +451,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonCollectionReaderWriter( JsonDateTimeReaderWriter.Instance)), @@ -485,6 +494,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonCollectionReaderWriter, List, byte>( JsonByteReaderWriter.Instance)), @@ -527,6 +537,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonCollectionReaderWriter, List, byte>( JsonByteReaderWriter.Instance)), @@ -569,6 +580,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonCollectionReaderWriter, List, short>( JsonInt16ReaderWriter.Instance)), diff --git a/test/EFCore.SqlServer.FunctionalTests/Scaffolding/Baselines/BigModel_with_JSON_columns/DbContextModelBuilder.cs b/test/EFCore.SqlServer.FunctionalTests/Scaffolding/Baselines/BigModel_with_JSON_columns/DbContextModelBuilder.cs index 6ea83b0ce7b..69e28ca1676 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Scaffolding/Baselines/BigModel_with_JSON_columns/DbContextModelBuilder.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Scaffolding/Baselines/BigModel_with_JSON_columns/DbContextModelBuilder.cs @@ -201,7 +201,7 @@ private IRelationalModel CreateRelationalModel() microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("Char", charColumnBase); var charArrayColumnBase = new ColumnBase("CharArray", "nvarchar(max)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase); microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("CharArray", charArrayColumnBase); - var charToStringConverterPropertyColumnBase = new ColumnBase("CharToStringConverterProperty", "nvarchar(1)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase); + var charToStringConverterPropertyColumnBase = new ColumnBase("CharToStringConverterProperty", "nchar(1)", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase); microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("CharToStringConverterProperty", charToStringConverterPropertyColumnBase); var dateOnlyColumnBase = new ColumnBase("DateOnly", "date", microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase); microsoftEntityFrameworkCoreScaffoldingCompiledModelTestBaseManyTypesTableBase.Columns.Add("DateOnly", dateOnlyColumnBase); @@ -1042,7 +1042,7 @@ private IRelationalModel CreateRelationalModel() manyTypesTable.Columns.Add("Char", charColumn); var charArrayColumn = new Column("CharArray", "nvarchar(max)", manyTypesTable); manyTypesTable.Columns.Add("CharArray", charArrayColumn); - var charToStringConverterPropertyColumn = new Column("CharToStringConverterProperty", "nvarchar(1)", manyTypesTable); + var charToStringConverterPropertyColumn = new Column("CharToStringConverterProperty", "nchar(1)", manyTypesTable); manyTypesTable.Columns.Add("CharToStringConverterProperty", charToStringConverterPropertyColumn); var dateOnlyColumn = new Column("DateOnly", "date", manyTypesTable); manyTypesTable.Columns.Add("DateOnly", dateOnlyColumn); diff --git a/test/EFCore.SqlServer.FunctionalTests/Scaffolding/Baselines/BigModel_with_JSON_columns/DependentDerivedEntityType.cs b/test/EFCore.SqlServer.FunctionalTests/Scaffolding/Baselines/BigModel_with_JSON_columns/DependentDerivedEntityType.cs index a9a9348ce6f..bc3c7e5d733 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Scaffolding/Baselines/BigModel_with_JSON_columns/DependentDerivedEntityType.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Scaffolding/Baselines/BigModel_with_JSON_columns/DependentDerivedEntityType.cs @@ -48,6 +48,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "char(20)", size: 20, + fixedLength: true, dbType: System.Data.DbType.AnsiStringFixedLength)); data.AddAnnotation("Relational:IsFixedLength", true); data.AddAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.None); diff --git a/test/EFCore.SqlServer.FunctionalTests/Scaffolding/Baselines/BigModel_with_JSON_columns/ManyTypesEntityType.cs b/test/EFCore.SqlServer.FunctionalTests/Scaffolding/Baselines/BigModel_with_JSON_columns/ManyTypesEntityType.cs index eec96037a75..03df4d23893 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Scaffolding/Baselines/BigModel_with_JSON_columns/ManyTypesEntityType.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Scaffolding/Baselines/BigModel_with_JSON_columns/ManyTypesEntityType.cs @@ -106,6 +106,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonCollectionReaderWriter( JsonBoolReaderWriter.Instance)), @@ -148,6 +149,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(1)", size: 1, + unicode: true, dbType: System.Data.DbType.String), converter: new ValueConverter( (bool v) => (string)(v ? "B" : "A"), @@ -262,6 +264,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonCollectionReaderWriter( JsonByteArrayReaderWriter.Instance)), @@ -308,6 +311,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new ValueConverter( (Byte[] v) => Convert.ToBase64String(v), @@ -371,6 +375,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(1)", size: 1, + unicode: true, dbType: System.Data.DbType.String), converter: new ValueConverter( (char v) => string.Format(CultureInfo.InvariantCulture, "{0}", (object)v), @@ -403,6 +408,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonCollectionReaderWriter( new JsonConvertedValueReaderWriter( @@ -433,6 +439,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(1)", size: 1, + unicode: true, dbType: System.Data.DbType.String), converter: new ValueConverter( (char v) => string.Format(CultureInfo.InvariantCulture, "{0}", (object)v), @@ -464,9 +471,11 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v.GetHashCode(), (string v) => v), mappingInfo: new RelationalTypeMappingInfo( - storeTypeName: "nvarchar(1)", + storeTypeName: "nchar(1)", size: 1, - dbType: System.Data.DbType.String), + unicode: true, + fixedLength: true, + dbType: System.Data.DbType.StringFixedLength), converter: new ValueConverter( (char v) => string.Format(CultureInfo.InvariantCulture, "{0}", (object)v), (string v) => v.Length < 1 ? '\0' : v[0]), @@ -476,6 +485,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (char v) => string.Format(CultureInfo.InvariantCulture, "{0}", (object)v), (string v) => v.Length < 1 ? '\0' : v[0]))); charToStringConverterProperty.SetSentinelFromProviderValue("\0"); + charToStringConverterProperty.AddAnnotation("Relational:IsFixedLength", true); charToStringConverterProperty.AddAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.None); var dateOnly = runtimeEntityType.AddProperty( @@ -519,6 +529,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonCollectionReaderWriter( JsonDateOnlyReaderWriter.Instance)), @@ -562,6 +573,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(10)", size: 10, + unicode: true, dbType: System.Data.DbType.String), converter: new ValueConverter( (DateOnly v) => v.ToString("yyyy\\-MM\\-dd"), @@ -615,6 +627,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonCollectionReaderWriter( JsonDateTimeReaderWriter.Instance)), @@ -721,6 +734,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(48)", size: 48, + unicode: true, dbType: System.Data.DbType.String), converter: new ValueConverter( (DateTimeOffset v) => v.ToString("yyyy\\-MM\\-dd HH\\:mm\\:ss.FFFFFFFzzz"), @@ -785,6 +799,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(48)", size: 48, + unicode: true, dbType: System.Data.DbType.String), converter: new ValueConverter( (DateTime v) => v.ToString("yyyy\\-MM\\-dd HH\\:mm\\:ss.FFFFFFF"), @@ -859,6 +874,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonCollectionReaderWriter( JsonDecimalReaderWriter.Instance)), @@ -935,6 +951,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(64)", size: 64, + unicode: true, dbType: System.Data.DbType.String), converter: new ValueConverter( (decimal v) => string.Format(CultureInfo.InvariantCulture, "{0}", (object)v), @@ -988,6 +1005,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonCollectionReaderWriter( JsonDoubleReaderWriter.Instance)), @@ -1064,6 +1082,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(64)", size: 64, + unicode: true, dbType: System.Data.DbType.String), converter: new ValueConverter( (double v) => string.Format(CultureInfo.InvariantCulture, "{0:R}", (object)v), @@ -1125,6 +1144,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonCollectionReaderWriter( new JsonConvertedValueReaderWriter( @@ -1183,6 +1203,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new ValueConverter( (CompiledModelTestBase.Enum16 v) => v.ToString(), @@ -1216,6 +1237,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonCollectionReaderWriter( new JsonConvertedValueReaderWriter( @@ -1245,6 +1267,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new ValueConverter( (CompiledModelTestBase.Enum16 v) => v.ToString(), @@ -1277,6 +1300,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonCollectionReaderWriter, List, CompiledModelTestBase.Enum16>( new JsonConvertedValueReaderWriter( @@ -1306,6 +1330,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new ValueConverter( (CompiledModelTestBase.Enum16 v) => v.ToString(), @@ -1338,6 +1363,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonCollectionReaderWriter, List, CompiledModelTestBase.Enum16>( new JsonConvertedValueReaderWriter( @@ -1424,6 +1450,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonCollectionReaderWriter( new JsonConvertedValueReaderWriter( @@ -1482,6 +1509,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new ValueConverter( (CompiledModelTestBase.Enum32 v) => v.ToString(), @@ -1515,6 +1543,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonCollectionReaderWriter( new JsonConvertedValueReaderWriter( @@ -1544,6 +1573,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new ValueConverter( (CompiledModelTestBase.Enum32 v) => v.ToString(), @@ -1576,6 +1606,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonCollectionReaderWriter, List, CompiledModelTestBase.Enum32>( new JsonConvertedValueReaderWriter( @@ -1605,6 +1636,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new ValueConverter( (CompiledModelTestBase.Enum32 v) => v.ToString(), @@ -1637,6 +1669,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonCollectionReaderWriter, List, CompiledModelTestBase.Enum32>( new JsonConvertedValueReaderWriter( @@ -1723,6 +1756,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonCollectionReaderWriter( new JsonConvertedValueReaderWriter( @@ -1781,6 +1815,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new ValueConverter( (CompiledModelTestBase.Enum64 v) => v.ToString(), @@ -1814,6 +1849,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonCollectionReaderWriter( new JsonConvertedValueReaderWriter( @@ -1843,6 +1879,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new ValueConverter( (CompiledModelTestBase.Enum64 v) => v.ToString(), @@ -1875,6 +1912,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonCollectionReaderWriter, List, CompiledModelTestBase.Enum64>( new JsonConvertedValueReaderWriter( @@ -1904,6 +1942,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new ValueConverter( (CompiledModelTestBase.Enum64 v) => v.ToString(), @@ -1936,6 +1975,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonCollectionReaderWriter, List, CompiledModelTestBase.Enum64>( new JsonConvertedValueReaderWriter( @@ -2022,6 +2062,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonCollectionReaderWriter( new JsonConvertedValueReaderWriter( @@ -2080,6 +2121,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new ValueConverter( (CompiledModelTestBase.Enum8 v) => v.ToString(), @@ -2113,6 +2155,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonCollectionReaderWriter( new JsonConvertedValueReaderWriter( @@ -2142,6 +2185,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new ValueConverter( (CompiledModelTestBase.Enum8 v) => v.ToString(), @@ -2174,6 +2218,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonCollectionReaderWriter, List, CompiledModelTestBase.Enum8>( new JsonConvertedValueReaderWriter( @@ -2203,6 +2248,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new ValueConverter( (CompiledModelTestBase.Enum8 v) => v.ToString(), @@ -2235,6 +2281,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonCollectionReaderWriter, List, CompiledModelTestBase.Enum8>( new JsonConvertedValueReaderWriter( @@ -2323,6 +2370,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new ValueConverter( (CompiledModelTestBase.Enum32 v) => v.ToString(), @@ -2385,6 +2433,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonCollectionReaderWriter( new JsonConvertedValueReaderWriter( @@ -2443,6 +2492,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new ValueConverter( (CompiledModelTestBase.EnumU16 v) => v.ToString(), @@ -2476,6 +2526,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonCollectionReaderWriter( new JsonConvertedValueReaderWriter( @@ -2505,6 +2556,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new ValueConverter( (CompiledModelTestBase.EnumU16 v) => v.ToString(), @@ -2537,6 +2589,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonCollectionReaderWriter, List, CompiledModelTestBase.EnumU16>( new JsonConvertedValueReaderWriter( @@ -2566,6 +2619,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new ValueConverter( (CompiledModelTestBase.EnumU16 v) => v.ToString(), @@ -2598,6 +2652,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonCollectionReaderWriter, List, CompiledModelTestBase.EnumU16>( new JsonConvertedValueReaderWriter( @@ -2684,6 +2739,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonCollectionReaderWriter( new JsonConvertedValueReaderWriter( @@ -2742,6 +2798,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new ValueConverter( (CompiledModelTestBase.EnumU32 v) => v.ToString(), @@ -2775,6 +2832,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonCollectionReaderWriter( new JsonConvertedValueReaderWriter( @@ -2804,6 +2862,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new ValueConverter( (CompiledModelTestBase.EnumU32 v) => v.ToString(), @@ -2836,6 +2895,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonCollectionReaderWriter, List, CompiledModelTestBase.EnumU32>( new JsonConvertedValueReaderWriter( @@ -2865,6 +2925,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new ValueConverter( (CompiledModelTestBase.EnumU32 v) => v.ToString(), @@ -2897,6 +2958,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonCollectionReaderWriter, List, CompiledModelTestBase.EnumU32>( new JsonConvertedValueReaderWriter( @@ -2987,6 +3049,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonCollectionReaderWriter( new JsonConvertedValueReaderWriter( @@ -3049,6 +3112,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new ValueConverter( (CompiledModelTestBase.EnumU64 v) => v.ToString(), @@ -3082,6 +3146,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonCollectionReaderWriter( new JsonConvertedValueReaderWriter( @@ -3111,6 +3176,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new ValueConverter( (CompiledModelTestBase.EnumU64 v) => v.ToString(), @@ -3143,6 +3209,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonCollectionReaderWriter, List, CompiledModelTestBase.EnumU64>( new JsonConvertedValueReaderWriter( @@ -3172,6 +3239,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new ValueConverter( (CompiledModelTestBase.EnumU64 v) => v.ToString(), @@ -3204,6 +3272,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonCollectionReaderWriter, List, CompiledModelTestBase.EnumU64>( new JsonConvertedValueReaderWriter( @@ -3294,6 +3363,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonCollectionReaderWriter( new JsonConvertedValueReaderWriter( @@ -3352,6 +3422,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new ValueConverter( (CompiledModelTestBase.EnumU8 v) => v.ToString(), @@ -3385,6 +3456,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonCollectionReaderWriter( new JsonConvertedValueReaderWriter( @@ -3414,6 +3486,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new ValueConverter( (CompiledModelTestBase.EnumU8 v) => v.ToString(), @@ -3446,6 +3519,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonCollectionReaderWriter, List, CompiledModelTestBase.EnumU8>( new JsonConvertedValueReaderWriter( @@ -3475,6 +3549,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new ValueConverter( (CompiledModelTestBase.EnumU8 v) => v.ToString(), @@ -3507,6 +3582,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonCollectionReaderWriter, List, CompiledModelTestBase.EnumU8>( new JsonConvertedValueReaderWriter( @@ -3585,6 +3661,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonCollectionReaderWriter( JsonFloatReaderWriter.Instance)), @@ -3649,6 +3726,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonCollectionReaderWriter( JsonGuidReaderWriter.Instance)), @@ -3727,6 +3805,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(36)", size: 36, + unicode: true, dbType: System.Data.DbType.String), converter: new ValueConverter( (Guid v) => v.ToString("D"), @@ -3760,6 +3839,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(45)", size: 45, + unicode: true, dbType: System.Data.DbType.String), converter: new ValueConverter( (IPAddress v) => v.ToString(), @@ -3791,6 +3871,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonCollectionReaderWriter( new JsonConvertedValueReaderWriter( @@ -3821,6 +3902,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(45)", size: 45, + unicode: true, dbType: System.Data.DbType.String), converter: new ValueConverter( (IPAddress v) => v.ToString(), @@ -3886,6 +3968,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(45)", size: 45, + unicode: true, dbType: System.Data.DbType.String), converter: new ValueConverter( (IPAddress v) => v.ToString(), @@ -3938,6 +4021,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonCollectionReaderWriter( JsonInt16ReaderWriter.Instance)), @@ -4000,6 +4084,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonCollectionReaderWriter( JsonInt32ReaderWriter.Instance)), @@ -4062,6 +4147,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonCollectionReaderWriter( JsonInt64ReaderWriter.Instance)), @@ -4132,6 +4218,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonCollectionReaderWriter( new JsonConvertedValueReaderWriter( @@ -4224,6 +4311,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(64)", size: 64, + unicode: true, dbType: System.Data.DbType.String), converter: new ValueConverter( (int v) => string.Format(CultureInfo.InvariantCulture, "{0}", (object)v), @@ -4258,6 +4346,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new ValueConverter( (Nullable v) => v == null ? null : v.ToString(), @@ -4313,6 +4402,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonNullableStructCollectionReaderWriter( JsonBoolReaderWriter.Instance)), @@ -4378,6 +4468,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonCollectionReaderWriter( JsonByteArrayReaderWriter.Instance)), @@ -4424,6 +4515,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(1)", size: 1, + unicode: true, dbType: System.Data.DbType.String), converter: new ValueConverter( (char v) => string.Format(CultureInfo.InvariantCulture, "{0}", (object)v), @@ -4455,6 +4547,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonNullableStructCollectionReaderWriter( new JsonConvertedValueReaderWriter( @@ -4485,6 +4578,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(1)", size: 1, + unicode: true, dbType: System.Data.DbType.String), converter: new ValueConverter( (char v) => string.Format(CultureInfo.InvariantCulture, "{0}", (object)v), @@ -4537,6 +4631,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonNullableStructCollectionReaderWriter( JsonDateOnlyReaderWriter.Instance)), @@ -4599,6 +4694,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonNullableStructCollectionReaderWriter( JsonDateTimeReaderWriter.Instance)), @@ -4661,6 +4757,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonNullableStructCollectionReaderWriter( JsonDecimalReaderWriter.Instance)), @@ -4723,6 +4820,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonNullableStructCollectionReaderWriter( JsonDoubleReaderWriter.Instance)), @@ -4793,6 +4891,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonNullableStructCollectionReaderWriter( new JsonConvertedValueReaderWriter( @@ -4879,6 +4978,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonNullableStructCollectionReaderWriter( new JsonConvertedValueReaderWriter( @@ -4936,6 +5036,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonNullableStructCollectionReaderWriter, List, CompiledModelTestBase.Enum16>( new JsonConvertedValueReaderWriter( @@ -4993,6 +5094,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonNullableStructCollectionReaderWriter, List, CompiledModelTestBase.Enum16>( new JsonConvertedValueReaderWriter( @@ -5079,6 +5181,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonNullableStructCollectionReaderWriter( new JsonConvertedValueReaderWriter( @@ -5165,6 +5268,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonNullableStructCollectionReaderWriter( new JsonConvertedValueReaderWriter( @@ -5222,6 +5326,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonNullableStructCollectionReaderWriter, List, CompiledModelTestBase.Enum32>( new JsonConvertedValueReaderWriter( @@ -5279,6 +5384,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonNullableStructCollectionReaderWriter, List, CompiledModelTestBase.Enum32>( new JsonConvertedValueReaderWriter( @@ -5365,6 +5471,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonNullableStructCollectionReaderWriter( new JsonConvertedValueReaderWriter( @@ -5451,6 +5558,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonNullableStructCollectionReaderWriter( new JsonConvertedValueReaderWriter( @@ -5508,6 +5616,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonNullableStructCollectionReaderWriter, List, CompiledModelTestBase.Enum64>( new JsonConvertedValueReaderWriter( @@ -5565,6 +5674,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonNullableStructCollectionReaderWriter, List, CompiledModelTestBase.Enum64>( new JsonConvertedValueReaderWriter( @@ -5651,6 +5761,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonNullableStructCollectionReaderWriter( new JsonConvertedValueReaderWriter( @@ -5737,6 +5848,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonNullableStructCollectionReaderWriter( new JsonConvertedValueReaderWriter( @@ -5794,6 +5906,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonNullableStructCollectionReaderWriter, List, CompiledModelTestBase.Enum8>( new JsonConvertedValueReaderWriter( @@ -5851,6 +5964,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonNullableStructCollectionReaderWriter, List, CompiledModelTestBase.Enum8>( new JsonConvertedValueReaderWriter( @@ -5937,6 +6051,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonNullableStructCollectionReaderWriter( new JsonConvertedValueReaderWriter( @@ -6023,6 +6138,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonNullableStructCollectionReaderWriter( new JsonConvertedValueReaderWriter( @@ -6080,6 +6196,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonNullableStructCollectionReaderWriter, List, CompiledModelTestBase.EnumU16>( new JsonConvertedValueReaderWriter( @@ -6137,6 +6254,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonNullableStructCollectionReaderWriter, List, CompiledModelTestBase.EnumU16>( new JsonConvertedValueReaderWriter( @@ -6223,6 +6341,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonNullableStructCollectionReaderWriter( new JsonConvertedValueReaderWriter( @@ -6309,6 +6428,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonNullableStructCollectionReaderWriter( new JsonConvertedValueReaderWriter( @@ -6366,6 +6486,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonNullableStructCollectionReaderWriter, List, CompiledModelTestBase.EnumU32>( new JsonConvertedValueReaderWriter( @@ -6423,6 +6544,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonNullableStructCollectionReaderWriter, List, CompiledModelTestBase.EnumU32>( new JsonConvertedValueReaderWriter( @@ -6513,6 +6635,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonNullableStructCollectionReaderWriter( new JsonConvertedValueReaderWriter( @@ -6607,6 +6730,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonNullableStructCollectionReaderWriter( new JsonConvertedValueReaderWriter( @@ -6668,6 +6792,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonNullableStructCollectionReaderWriter, List, CompiledModelTestBase.EnumU64>( new JsonConvertedValueReaderWriter( @@ -6729,6 +6854,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonNullableStructCollectionReaderWriter, List, CompiledModelTestBase.EnumU64>( new JsonConvertedValueReaderWriter( @@ -6819,6 +6945,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonNullableStructCollectionReaderWriter( new JsonConvertedValueReaderWriter( @@ -6905,6 +7032,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonNullableStructCollectionReaderWriter( new JsonConvertedValueReaderWriter( @@ -6962,6 +7090,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonNullableStructCollectionReaderWriter, List, CompiledModelTestBase.EnumU8>( new JsonConvertedValueReaderWriter( @@ -7019,6 +7148,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonNullableStructCollectionReaderWriter, List, CompiledModelTestBase.EnumU8>( new JsonConvertedValueReaderWriter( @@ -7097,6 +7227,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonNullableStructCollectionReaderWriter( JsonFloatReaderWriter.Instance)), @@ -7161,6 +7292,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonNullableStructCollectionReaderWriter( JsonGuidReaderWriter.Instance)), @@ -7206,6 +7338,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(45)", size: 45, + unicode: true, dbType: System.Data.DbType.String), converter: new ValueConverter( (IPAddress v) => v.ToString(), @@ -7237,6 +7370,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonCollectionReaderWriter( new JsonConvertedValueReaderWriter( @@ -7267,6 +7401,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(45)", size: 45, + unicode: true, dbType: System.Data.DbType.String), converter: new ValueConverter( (IPAddress v) => v.ToString(), @@ -7319,6 +7454,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonNullableStructCollectionReaderWriter( JsonInt16ReaderWriter.Instance)), @@ -7381,6 +7517,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonNullableStructCollectionReaderWriter( JsonInt32ReaderWriter.Instance)), @@ -7443,6 +7580,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonNullableStructCollectionReaderWriter( JsonInt64ReaderWriter.Instance)), @@ -7513,6 +7651,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonNullableStructCollectionReaderWriter( new JsonConvertedValueReaderWriter( @@ -7572,6 +7711,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(20)", size: 20, + unicode: true, dbType: System.Data.DbType.String), converter: new ValueConverter( (PhysicalAddress v) => v.ToString(), @@ -7603,6 +7743,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonCollectionReaderWriter( new JsonConvertedValueReaderWriter( @@ -7633,6 +7774,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(20)", size: 20, + unicode: true, dbType: System.Data.DbType.String), converter: new ValueConverter( (PhysicalAddress v) => v.ToString(), @@ -7665,6 +7807,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), storeTypePostfix: StoreTypePostfix.None); nullableString.AddAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.None); @@ -7689,6 +7832,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonCollectionReaderWriter( JsonStringReaderWriter.Instance)), @@ -7710,6 +7854,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), storeTypePostfix: StoreTypePostfix.None)); nullableStringArray.AddAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.None); @@ -7755,6 +7900,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonNullableStructCollectionReaderWriter( JsonTimeOnlyReaderWriter.Instance)), @@ -7817,6 +7963,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonNullableStructCollectionReaderWriter( JsonTimeSpanReaderWriter.Instance)), @@ -7887,6 +8034,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonNullableStructCollectionReaderWriter( new JsonConvertedValueReaderWriter( @@ -7973,6 +8121,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonNullableStructCollectionReaderWriter( new JsonConvertedValueReaderWriter( @@ -8063,6 +8212,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonNullableStructCollectionReaderWriter( new JsonConvertedValueReaderWriter( @@ -8145,6 +8295,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonNullableStructCollectionReaderWriter( JsonByteReaderWriter.Instance)), @@ -8187,6 +8338,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new ValueConverter( (Uri v) => v.ToString(), @@ -8219,6 +8371,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonCollectionReaderWriter( new JsonConvertedValueReaderWriter( @@ -8248,6 +8401,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new ValueConverter( (Uri v) => v.ToString(), @@ -8281,6 +8435,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(20)", size: 20, + unicode: true, dbType: System.Data.DbType.String), converter: new ValueConverter( (PhysicalAddress v) => v.ToString(), @@ -8312,6 +8467,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonCollectionReaderWriter( new JsonConvertedValueReaderWriter( @@ -8342,6 +8498,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(20)", size: 20, + unicode: true, dbType: System.Data.DbType.String), converter: new ValueConverter( (PhysicalAddress v) => v.ToString(), @@ -8407,6 +8564,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(20)", size: 20, + unicode: true, dbType: System.Data.DbType.String), converter: new ValueConverter( (PhysicalAddress v) => v.ToString(), @@ -8438,6 +8596,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), storeTypePostfix: StoreTypePostfix.None); @string.AddAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.None); @@ -8462,6 +8621,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonCollectionReaderWriter( JsonStringReaderWriter.Instance)), @@ -8483,6 +8643,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), storeTypePostfix: StoreTypePostfix.None)); stringArray.AddAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.None); @@ -8570,6 +8731,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(1)", size: 1, + unicode: true, dbType: System.Data.DbType.String), converter: new ValueConverter( (string v) => string.Format(CultureInfo.InvariantCulture, "{0}", (object)(v.Length < 1 ? '\0' : v[0])), @@ -8785,6 +8947,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), storeTypePostfix: StoreTypePostfix.None); stringToGuidConverterProperty.AddAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.None); @@ -8903,6 +9066,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new ValueConverter( (string v) => new Uri(v, UriKind.RelativeOrAbsolute).ToString(), @@ -8956,6 +9120,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonCollectionReaderWriter( JsonTimeOnlyReaderWriter.Instance)), @@ -8999,6 +9164,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(48)", size: 48, + unicode: true, dbType: System.Data.DbType.String), converter: new ValueConverter( (TimeOnly v) => v.Ticks % 10000000L == 0L ? string.Format(CultureInfo.InvariantCulture, "{0:HH\\:mm\\:ss}", (object)v) : v.ToString("o"), @@ -9082,6 +9248,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonCollectionReaderWriter( JsonTimeSpanReaderWriter.Instance)), @@ -9125,6 +9292,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(48)", size: 48, + unicode: true, dbType: System.Data.DbType.String), converter: new ValueConverter( (TimeSpan v) => v.ToString("c"), @@ -9216,6 +9384,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonCollectionReaderWriter( new JsonConvertedValueReaderWriter( @@ -9302,6 +9471,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonCollectionReaderWriter( new JsonConvertedValueReaderWriter( @@ -9392,6 +9562,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonCollectionReaderWriter( new JsonConvertedValueReaderWriter( @@ -9497,6 +9668,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new ValueConverter( (Uri v) => v.ToString(), @@ -9529,6 +9701,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonCollectionReaderWriter( new JsonConvertedValueReaderWriter( @@ -9558,6 +9731,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new ValueConverter( (Uri v) => v.ToString(), @@ -9591,6 +9765,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new ValueConverter( (Uri v) => v.ToString(), diff --git a/test/EFCore.SqlServer.FunctionalTests/Scaffolding/Baselines/BigModel_with_JSON_columns/OwnedType0EntityType.cs b/test/EFCore.SqlServer.FunctionalTests/Scaffolding/Baselines/BigModel_with_JSON_columns/OwnedType0EntityType.cs index 601d8ec16b0..69bb41b404f 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Scaffolding/Baselines/BigModel_with_JSON_columns/OwnedType0EntityType.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Scaffolding/Baselines/BigModel_with_JSON_columns/OwnedType0EntityType.cs @@ -115,6 +115,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), storeTypePostfix: StoreTypePostfix.None); details.AddAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.None); @@ -161,6 +162,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonCollectionReaderWriter( new JsonConvertedValueReaderWriter( @@ -191,6 +193,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(45)", size: 45, + unicode: true, dbType: System.Data.DbType.String), converter: new ValueConverter( (IPAddress v) => v.ToString(), @@ -223,6 +226,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonCollectionReaderWriter, List, string>( JsonStringReaderWriter.Instance)), @@ -244,6 +248,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), storeTypePostfix: StoreTypePostfix.None)); refTypeEnumerable.AddAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.None); @@ -269,6 +274,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonCollectionReaderWriter, List, string>( JsonStringReaderWriter.Instance)), @@ -290,6 +296,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), storeTypePostfix: StoreTypePostfix.None)); refTypeIList.AddAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.None); @@ -315,6 +322,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonCollectionReaderWriter, List, IPAddress>( new JsonConvertedValueReaderWriter( @@ -345,6 +353,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(45)", size: 45, + unicode: true, dbType: System.Data.DbType.String), converter: new ValueConverter( (IPAddress v) => v.ToString(), @@ -377,6 +386,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonCollectionReaderWriter( JsonDateTimeReaderWriter.Instance)), @@ -419,6 +429,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonCollectionReaderWriter, List, byte>( JsonByteReaderWriter.Instance)), @@ -461,6 +472,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonCollectionReaderWriter, List, byte>( JsonByteReaderWriter.Instance)), @@ -503,6 +515,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonCollectionReaderWriter, List, short>( JsonInt16ReaderWriter.Instance)), diff --git a/test/EFCore.SqlServer.FunctionalTests/Scaffolding/Baselines/BigModel_with_JSON_columns/OwnedTypeEntityType.cs b/test/EFCore.SqlServer.FunctionalTests/Scaffolding/Baselines/BigModel_with_JSON_columns/OwnedTypeEntityType.cs index cd0f61cbd3a..875d0177525 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Scaffolding/Baselines/BigModel_with_JSON_columns/OwnedTypeEntityType.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Scaffolding/Baselines/BigModel_with_JSON_columns/OwnedTypeEntityType.cs @@ -98,6 +98,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), storeTypePostfix: StoreTypePostfix.None); details.AddAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.None); @@ -146,6 +147,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonCollectionReaderWriter( new JsonConvertedValueReaderWriter( @@ -176,6 +178,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(45)", size: 45, + unicode: true, dbType: System.Data.DbType.String), converter: new ValueConverter( (IPAddress v) => v.ToString(), @@ -209,6 +212,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonCollectionReaderWriter, List, string>( JsonStringReaderWriter.Instance)), @@ -230,6 +234,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), storeTypePostfix: StoreTypePostfix.None)); refTypeEnumerable.AddAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.None); @@ -256,6 +261,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonCollectionReaderWriter, List, string>( JsonStringReaderWriter.Instance)), @@ -277,6 +283,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), storeTypePostfix: StoreTypePostfix.None)); refTypeIList.AddAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.None); @@ -303,6 +310,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonCollectionReaderWriter, List, IPAddress>( new JsonConvertedValueReaderWriter( @@ -333,6 +341,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(45)", size: 45, + unicode: true, dbType: System.Data.DbType.String), converter: new ValueConverter( (IPAddress v) => v.ToString(), @@ -366,6 +375,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonCollectionReaderWriter( JsonDateTimeReaderWriter.Instance)), @@ -409,6 +419,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonCollectionReaderWriter, List, byte>( JsonByteReaderWriter.Instance)), @@ -452,6 +463,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonCollectionReaderWriter, List, byte>( JsonByteReaderWriter.Instance)), @@ -495,6 +507,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonCollectionReaderWriter, List, short>( JsonInt16ReaderWriter.Instance)), diff --git a/test/EFCore.SqlServer.FunctionalTests/Scaffolding/Baselines/BigModel_with_JSON_columns/PrincipalBaseEntityType.cs b/test/EFCore.SqlServer.FunctionalTests/Scaffolding/Baselines/BigModel_with_JSON_columns/PrincipalBaseEntityType.cs index bf804669d98..1730d8cf461 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Scaffolding/Baselines/BigModel_with_JSON_columns/PrincipalBaseEntityType.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Scaffolding/Baselines/BigModel_with_JSON_columns/PrincipalBaseEntityType.cs @@ -103,6 +103,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(55)", size: 55, + unicode: true, dbType: System.Data.DbType.String)); discriminator.AddAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.None); @@ -243,6 +244,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonCollectionReaderWriter( new JsonConvertedValueReaderWriter( @@ -273,6 +275,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(45)", size: 45, + unicode: true, dbType: System.Data.DbType.String), converter: new ValueConverter( (IPAddress v) => v.ToString(), @@ -305,6 +308,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonCollectionReaderWriter, List, string>( JsonStringReaderWriter.Instance)), @@ -326,6 +330,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), storeTypePostfix: StoreTypePostfix.None)); refTypeEnumerable.AddAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.None); @@ -351,6 +356,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonCollectionReaderWriter, List, string>( JsonStringReaderWriter.Instance)), @@ -372,6 +378,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), storeTypePostfix: StoreTypePostfix.None)); refTypeIList.AddAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.None); @@ -397,6 +404,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonCollectionReaderWriter, List, IPAddress>( new JsonConvertedValueReaderWriter( @@ -427,6 +435,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(45)", size: 45, + unicode: true, dbType: System.Data.DbType.String), converter: new ValueConverter( (IPAddress v) => v.ToString(), @@ -459,6 +468,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonCollectionReaderWriter( JsonDateTimeReaderWriter.Instance)), @@ -501,6 +511,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonCollectionReaderWriter, List, byte>( JsonByteReaderWriter.Instance)), @@ -543,6 +554,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonCollectionReaderWriter, List, byte>( JsonByteReaderWriter.Instance)), @@ -585,6 +597,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonCollectionReaderWriter, List, short>( JsonInt16ReaderWriter.Instance)), diff --git a/test/EFCore.SqlServer.FunctionalTests/Scaffolding/Baselines/ComplexTypes/PrincipalBaseEntityType.cs b/test/EFCore.SqlServer.FunctionalTests/Scaffolding/Baselines/ComplexTypes/PrincipalBaseEntityType.cs index bf0b3916b65..fe7e97ba3d2 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Scaffolding/Baselines/ComplexTypes/PrincipalBaseEntityType.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Scaffolding/Baselines/ComplexTypes/PrincipalBaseEntityType.cs @@ -80,6 +80,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(55)", size: 55, + unicode: true, dbType: System.Data.DbType.String)); discriminator.AddAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.None); @@ -239,6 +240,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonCollectionReaderWriter( new JsonConvertedValueReaderWriter( @@ -269,6 +271,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(45)", size: 45, + unicode: true, dbType: System.Data.DbType.String), converter: new ValueConverter( (IPAddress v) => v.ToString(), @@ -301,6 +304,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonCollectionReaderWriter, List, string>( JsonStringReaderWriter.Instance)), @@ -322,6 +326,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), storeTypePostfix: StoreTypePostfix.None)); refTypeEnumerable.AddAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.None); @@ -347,6 +352,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonCollectionReaderWriter, List, string>( JsonStringReaderWriter.Instance)), @@ -368,6 +374,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), storeTypePostfix: StoreTypePostfix.None)); refTypeIList.AddAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.None); @@ -393,6 +400,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonCollectionReaderWriter, List, IPAddress>( new JsonConvertedValueReaderWriter( @@ -423,6 +431,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(45)", size: 45, + unicode: true, dbType: System.Data.DbType.String), converter: new ValueConverter( (IPAddress v) => v.ToString(), @@ -455,6 +464,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonCollectionReaderWriter( JsonDateTimeReaderWriter.Instance)), @@ -497,6 +507,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonCollectionReaderWriter, List, byte>( JsonByteReaderWriter.Instance)), @@ -539,6 +550,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonCollectionReaderWriter, List, byte>( JsonByteReaderWriter.Instance)), @@ -581,6 +593,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonCollectionReaderWriter, List, short>( JsonInt16ReaderWriter.Instance)), @@ -710,6 +723,7 @@ public static RuntimeComplexProperty Create(RuntimeEntityType declaringType) (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonCollectionReaderWriter( new JsonConvertedValueReaderWriter( @@ -740,6 +754,7 @@ public static RuntimeComplexProperty Create(RuntimeEntityType declaringType) mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(45)", size: 45, + unicode: true, dbType: System.Data.DbType.String), converter: new ValueConverter( (IPAddress v) => v.ToString(), @@ -772,6 +787,7 @@ public static RuntimeComplexProperty Create(RuntimeEntityType declaringType) (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonCollectionReaderWriter, List, string>( JsonStringReaderWriter.Instance)), @@ -793,6 +809,7 @@ public static RuntimeComplexProperty Create(RuntimeEntityType declaringType) (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), storeTypePostfix: StoreTypePostfix.None)); refTypeEnumerable.AddAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.None); @@ -818,6 +835,7 @@ public static RuntimeComplexProperty Create(RuntimeEntityType declaringType) (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonCollectionReaderWriter, List, string>( JsonStringReaderWriter.Instance)), @@ -839,6 +857,7 @@ public static RuntimeComplexProperty Create(RuntimeEntityType declaringType) (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), storeTypePostfix: StoreTypePostfix.None)); refTypeIList.AddAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.None); @@ -864,6 +883,7 @@ public static RuntimeComplexProperty Create(RuntimeEntityType declaringType) (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonCollectionReaderWriter, List, IPAddress>( new JsonConvertedValueReaderWriter( @@ -894,6 +914,7 @@ public static RuntimeComplexProperty Create(RuntimeEntityType declaringType) mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(45)", size: 45, + unicode: true, dbType: System.Data.DbType.String), converter: new ValueConverter( (IPAddress v) => v.ToString(), @@ -926,6 +947,7 @@ public static RuntimeComplexProperty Create(RuntimeEntityType declaringType) (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonCollectionReaderWriter( JsonDateTimeReaderWriter.Instance)), @@ -968,6 +990,7 @@ public static RuntimeComplexProperty Create(RuntimeEntityType declaringType) (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonCollectionReaderWriter, List, byte>( JsonByteReaderWriter.Instance)), @@ -1010,6 +1033,7 @@ public static RuntimeComplexProperty Create(RuntimeEntityType declaringType) (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonCollectionReaderWriter, List, byte>( JsonByteReaderWriter.Instance)), @@ -1052,6 +1076,7 @@ public static RuntimeComplexProperty Create(RuntimeEntityType declaringType) (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonCollectionReaderWriter, List, short>( JsonInt16ReaderWriter.Instance)), @@ -1278,6 +1303,7 @@ public static RuntimeComplexProperty Create(RuntimeComplexType declaringType) (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonCollectionReaderWriter( new JsonConvertedValueReaderWriter( @@ -1308,6 +1334,7 @@ public static RuntimeComplexProperty Create(RuntimeComplexType declaringType) mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(45)", size: 45, + unicode: true, dbType: System.Data.DbType.String), converter: new ValueConverter( (IPAddress v) => v.ToString(), @@ -1340,6 +1367,7 @@ public static RuntimeComplexProperty Create(RuntimeComplexType declaringType) (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonCollectionReaderWriter, List, string>( JsonStringReaderWriter.Instance)), @@ -1361,6 +1389,7 @@ public static RuntimeComplexProperty Create(RuntimeComplexType declaringType) (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), storeTypePostfix: StoreTypePostfix.None)); refTypeEnumerable.AddAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.None); @@ -1386,6 +1415,7 @@ public static RuntimeComplexProperty Create(RuntimeComplexType declaringType) (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonCollectionReaderWriter, List, string>( JsonStringReaderWriter.Instance)), @@ -1407,6 +1437,7 @@ public static RuntimeComplexProperty Create(RuntimeComplexType declaringType) (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), storeTypePostfix: StoreTypePostfix.None)); refTypeIList.AddAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.None); @@ -1432,6 +1463,7 @@ public static RuntimeComplexProperty Create(RuntimeComplexType declaringType) (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonCollectionReaderWriter, List, IPAddress>( new JsonConvertedValueReaderWriter( @@ -1462,6 +1494,7 @@ public static RuntimeComplexProperty Create(RuntimeComplexType declaringType) mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(45)", size: 45, + unicode: true, dbType: System.Data.DbType.String), converter: new ValueConverter( (IPAddress v) => v.ToString(), @@ -1494,6 +1527,7 @@ public static RuntimeComplexProperty Create(RuntimeComplexType declaringType) (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonCollectionReaderWriter( JsonDateTimeReaderWriter.Instance)), @@ -1536,6 +1570,7 @@ public static RuntimeComplexProperty Create(RuntimeComplexType declaringType) (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonCollectionReaderWriter, List, byte>( JsonByteReaderWriter.Instance)), @@ -1578,6 +1613,7 @@ public static RuntimeComplexProperty Create(RuntimeComplexType declaringType) (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonCollectionReaderWriter, List, byte>( JsonByteReaderWriter.Instance)), @@ -1620,6 +1656,7 @@ public static RuntimeComplexProperty Create(RuntimeComplexType declaringType) (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonCollectionReaderWriter, List, short>( JsonInt16ReaderWriter.Instance)), diff --git a/test/EFCore.SqlServer.FunctionalTests/Scaffolding/Baselines/Custom_function_parameter_type_mapping/FunctionParameterTypeMappingContextModelBuilder.cs b/test/EFCore.SqlServer.FunctionalTests/Scaffolding/Baselines/Custom_function_parameter_type_mapping/FunctionParameterTypeMappingContextModelBuilder.cs index 5a8920d93c2..47969a88022 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Scaffolding/Baselines/Custom_function_parameter_type_mapping/FunctionParameterTypeMappingContextModelBuilder.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Scaffolding/Baselines/Custom_function_parameter_type_mapping/FunctionParameterTypeMappingContextModelBuilder.cs @@ -79,6 +79,7 @@ partial void Initialize() (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), storeTypePostfix: StoreTypePostfix.None); functions["Microsoft.EntityFrameworkCore.Scaffolding.CompiledModelRelationalTestBase+FunctionParameterTypeMappingContext.GetSqlFragmentStatic(string)"] = getSqlFragmentStatic; diff --git a/test/EFCore.SqlServer.FunctionalTests/Scaffolding/Baselines/Custom_function_type_mapping/FunctionTypeMappingContextModelBuilder.cs b/test/EFCore.SqlServer.FunctionalTests/Scaffolding/Baselines/Custom_function_type_mapping/FunctionTypeMappingContextModelBuilder.cs index a2fb41f74e5..b3068bed402 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Scaffolding/Baselines/Custom_function_type_mapping/FunctionTypeMappingContextModelBuilder.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Scaffolding/Baselines/Custom_function_type_mapping/FunctionTypeMappingContextModelBuilder.cs @@ -62,6 +62,7 @@ partial void Initialize() (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), storeTypePostfix: StoreTypePostfix.None); diff --git a/test/EFCore.SqlServer.FunctionalTests/Scaffolding/Baselines/DbFunctions/DbFunctionContextModelBuilder.cs b/test/EFCore.SqlServer.FunctionalTests/Scaffolding/Baselines/DbFunctions/DbFunctionContextModelBuilder.cs index f3e79c6a278..b5f009363bc 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Scaffolding/Baselines/DbFunctions/DbFunctionContextModelBuilder.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Scaffolding/Baselines/DbFunctions/DbFunctionContextModelBuilder.cs @@ -105,6 +105,8 @@ partial void Initialize() mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nchar(256)", size: 256, + unicode: true, + fixedLength: true, dbType: System.Data.DbType.StringFixedLength)); getCount.TypeMapping = IntTypeMapping.Default.Clone( @@ -208,6 +210,8 @@ partial void Initialize() mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nchar(256)", size: 256, + unicode: true, + fixedLength: true, dbType: System.Data.DbType.StringFixedLength)); isDateStatic.TypeMapping = SqlServerBoolTypeMapping.Default.Clone( diff --git a/test/EFCore.SqlServer.FunctionalTests/Scaffolding/Baselines/Tpc/PrincipalBaseEntityType.cs b/test/EFCore.SqlServer.FunctionalTests/Scaffolding/Baselines/Tpc/PrincipalBaseEntityType.cs index dc84aaf60a4..1c29bcb9fd4 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Scaffolding/Baselines/Tpc/PrincipalBaseEntityType.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Scaffolding/Baselines/Tpc/PrincipalBaseEntityType.cs @@ -252,6 +252,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonCollectionReaderWriter( new JsonConvertedValueReaderWriter( @@ -282,6 +283,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(45)", size: 45, + unicode: true, dbType: System.Data.DbType.String), converter: new ValueConverter( (IPAddress v) => v.ToString(), @@ -314,6 +316,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonCollectionReaderWriter, List, string>( JsonStringReaderWriter.Instance)), @@ -335,6 +338,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), storeTypePostfix: StoreTypePostfix.None)); refTypeEnumerable.AddAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.None); @@ -360,6 +364,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonCollectionReaderWriter, List, string>( JsonStringReaderWriter.Instance)), @@ -381,6 +386,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), storeTypePostfix: StoreTypePostfix.None)); refTypeIList.AddAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.None); @@ -406,6 +412,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonCollectionReaderWriter, List, IPAddress>( new JsonConvertedValueReaderWriter( @@ -436,6 +443,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(45)", size: 45, + unicode: true, dbType: System.Data.DbType.String), converter: new ValueConverter( (IPAddress v) => v.ToString(), @@ -468,6 +476,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonCollectionReaderWriter( JsonDateTimeReaderWriter.Instance)), @@ -510,6 +519,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonCollectionReaderWriter, List, byte>( JsonByteReaderWriter.Instance)), @@ -552,6 +562,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonCollectionReaderWriter, List, byte>( JsonByteReaderWriter.Instance)), @@ -594,6 +605,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas (string v) => v), mappingInfo: new RelationalTypeMappingInfo( storeTypeName: "nvarchar(max)", + unicode: true, dbType: System.Data.DbType.String), converter: new CollectionToJsonStringConverter(new JsonCollectionReaderWriter, List, short>( JsonInt16ReaderWriter.Instance)), diff --git a/test/EFCore.SqlServer.FunctionalTests/Scaffolding/CompiledModelSqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/Scaffolding/CompiledModelSqlServerTest.cs index 136cad1d549..3ceba2044c4 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Scaffolding/CompiledModelSqlServerTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Scaffolding/CompiledModelSqlServerTest.cs @@ -63,6 +63,13 @@ protected override void BuildBigModel(ModelBuilder modelBuilder, bool jsonColumn } }); }); + + modelBuilder.Entity( + eb => + { + eb.Property(m => m.CharToStringConverterProperty) + .IsFixedLength(true); + }); } protected override void AssertBigModel(IModel model, bool jsonColumns) @@ -166,6 +173,13 @@ protected override void AssertBigModel(IModel model, bool jsonColumns) Assert.Equal(SqlServerValueGenerationStrategy.None, rowid.GetValueGenerationStrategy()); var manyTypesType = model.FindEntityType(typeof(ManyTypes))!; + var stringProperty = manyTypesType.FindProperty(nameof(ManyTypes.String))!; + Assert.True(stringProperty.FindRelationalTypeMapping()!.IsUnicode); + Assert.False(stringProperty.FindRelationalTypeMapping()!.IsFixedLength); + var charToStringConverterProperty = manyTypesType.FindProperty(nameof(ManyTypes.CharToStringConverterProperty))!; + Assert.True(charToStringConverterProperty.FindRelationalTypeMapping()!.IsUnicode); + Assert.True(charToStringConverterProperty.FindRelationalTypeMapping()!.IsFixedLength); + var dependentNavigation = principalDerived.GetDeclaredNavigations().First(); var dependentBase = dependentNavigation.TargetEntityType; var dependentDerived = dependentBase.GetDerivedTypes().Single(); diff --git a/test/EFCore.Sqlite.FunctionalTests/MaterializationInterceptionSqliteTest.cs b/test/EFCore.Sqlite.FunctionalTests/MaterializationInterceptionSqliteTest.cs index 2c8faa0e5ca..02d1585c672 100644 --- a/test/EFCore.Sqlite.FunctionalTests/MaterializationInterceptionSqliteTest.cs +++ b/test/EFCore.Sqlite.FunctionalTests/MaterializationInterceptionSqliteTest.cs @@ -8,19 +8,13 @@ namespace Microsoft.EntityFrameworkCore; public class MaterializationInterceptionSqliteTest : - MaterializationInterceptionTestBase, - IClassFixture + MaterializationInterceptionTestBase { - public MaterializationInterceptionSqliteTest(MaterializationInterceptionSqliteFixture fixture) - : base(fixture) - { - } - - public override async Task Intercept_query_materialization_with_owned_types_projecting_collection(bool async) + public override async Task Intercept_query_materialization_with_owned_types_projecting_collection(bool async, bool usePooling) => Assert.Equal( SqliteStrings.ApplyNotSupported, (await Assert.ThrowsAsync( - () => base.Intercept_query_materialization_with_owned_types_projecting_collection(async))) + () => base.Intercept_query_materialization_with_owned_types_projecting_collection(async, usePooling))) .Message); public class SqliteLibraryContext : LibraryContext @@ -38,20 +32,6 @@ protected override void OnModelCreating(ModelBuilder modelBuilder) } } - public override LibraryContext CreateContext(IEnumerable interceptors, bool inject) - => new SqliteLibraryContext(Fixture.CreateOptions(interceptors, inject)); - - public class MaterializationInterceptionSqliteFixture : SingletonInterceptorsFixtureBase - { - protected override string StoreName - => "MaterializationInterception"; - - protected override ITestStoreFactory TestStoreFactory - => SqliteTestStoreFactory.Instance; - - protected override IServiceCollection InjectInterceptors( - IServiceCollection serviceCollection, - IEnumerable injectedInterceptors) - => base.InjectInterceptors(serviceCollection.AddEntityFrameworkSqlite(), injectedInterceptors); - } + protected override ITestStoreFactory TestStoreFactory + => SqliteTestStoreFactory.Instance; }