Merge branch 'master' into master-typeid-as-parameter

# Conflicts:
#	Orm/Xtensive.Orm/Orm/Configuration/DomainConfiguration.cs

Author: alex-kulakov

ChangeLog/7.1.0-Beta-2-dev.txt

@@ -12,6 +12,11 @@
 [main] SqlCustomFunctionCall and SqlFunctionCall share one base type
 [main] SqlFunctionCall.Arguments property is IReadOnlyList now and parameters can't be changed after instance creation
 [main] Xtensive.Sql.Dml.Extensions.IsNullReference() extension method is marked obsolete, use 'is null' operator instead
+[main] DirectSessionAccessor.GetChangedEntities() result type changed to improve enumeration
+[main] EntityChangeRegistry.GetItems(PersistenceState) changed result type to improve enumeration
+[main] EntitySetChangeRegistry.GetItems() changed result type to improve enumeration
+[main] IgnoreRule now has only one public constructor - parameterless
+[main] IgnoreRule supports indexes
 [main] BitFaster.Caching package reference is updated to 1.0.7
 [main] No error caused by ambiguity due to new IQueryable extension methods of .Net 6
 [reprocessing] DomainBuildErrorEventArgs (not sealed) became read-only structure

Extensions/TestCommon/TestCommon.csproj

@@ -8,11 +8,16 @@
     <AssemblyOriginatorKeyFile>$(ExtensionsKeyFile)</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <Import Project="$(SolutionDir)MSBuild\DataObjects.Net.InternalBuild.targets" />
+  <ItemGroup Condition="'$(TargetFramework)'=='net5.0'">
+    <PackageReference Include="System.Configuration.ConfigurationManager" Version="5.0.0" />
+  </ItemGroup>
+  <ItemGroup Condition="'$(TargetFramework)'=='net6.0'">
+    <PackageReference Include="System.Configuration.ConfigurationManager" Version="6.0.0" />
+  </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
     <PackageReference Include="NUnit" Version="3.13.2" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.2.0" />
-    <PackageReference Include="System.Configuration.ConfigurationManager" Version="5.0.0" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\Orm\Xtensive.Orm.Tests.Framework\Xtensive.Orm.Tests.Framework.csproj" />

Extensions/Xtensive.Orm.Reprocessing/Xtensive.Orm.Reprocessing.csproj

@@ -12,9 +12,12 @@
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>$(ExtensionsKeyFile)</AssemblyOriginatorKeyFile>
   </PropertyGroup>
-  <ItemGroup>
+  <ItemGroup Condition="'$(TargetFramework)' == 'net5.0'">
     <PackageReference Include="System.Configuration.ConfigurationManager" Version="5.0.0" />
   </ItemGroup>
+  <ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
+    <PackageReference Include="System.Configuration.ConfigurationManager" Version="6.0.0" />
+  </ItemGroup>
   <ItemGroup>
     <None Include="Readme.txt" />
   </ItemGroup>

Extensions/Xtensive.Orm.Security/Xtensive.Orm.Security.csproj

@@ -13,9 +13,12 @@
     <AssemblyOriginatorKeyFile>$(ExtensionsKeyFile)</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <Import Project="$(SolutionDir)MSBuild\DataObjects.Net.InternalBuild.targets" />
-  <ItemGroup>
+  <ItemGroup Condition="'$(TargetFramework)'=='net5.0'">
     <PackageReference Include="System.Configuration.ConfigurationManager" Version="5.0.0" />
   </ItemGroup>
+  <ItemGroup Condition="'$(TargetFramework)'=='net6.0'">
+    <PackageReference Include="System.Configuration.ConfigurationManager" Version="6.0.0" />
+  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\Orm\Xtensive.Orm\Xtensive.Orm.csproj" />
   </ItemGroup>

Extensions/Xtensive.Orm.Tracking/Xtensive.Orm.Tracking.csproj

@@ -12,9 +12,12 @@
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>$(ExtensionsKeyFile)</AssemblyOriginatorKeyFile>
   </PropertyGroup>
-  <ItemGroup>
+  <ItemGroup Condition="'$(TargetFramework)'=='net5.0'">
     <PackageReference Include="System.Configuration.ConfigurationManager" Version="5.0.0" />
   </ItemGroup>
+  <ItemGroup Condition="'$(TargetFramework)'=='net6.0'">
+    <PackageReference Include="System.Configuration.ConfigurationManager" Version="6.0.0" />
+  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\Orm\Xtensive.Orm\Xtensive.Orm.csproj" />
   </ItemGroup>

Extensions/Xtensive.Orm.Web/Xtensive.Orm.Web.csproj

@@ -15,12 +15,17 @@
   <ItemGroup>
     <None Include="Readme.txt" />
   </ItemGroup>
+  <ItemGroup Condition="'$(TargetFramework)'=='net5.0'">
+    <PackageReference Include="System.Configuration.ConfigurationManager" Version="5.0.0" />
+  </ItemGroup>
+  <ItemGroup Condition="'$(TargetFramework)'=='net6.0'">
+    <PackageReference Include="System.Configuration.ConfigurationManager" Version="6.0.0" />
+  </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.2.0" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.Abstractions" Version="2.2.0" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.Core" Version="2.2.0" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="3.1.0" />
-    <PackageReference Include="System.Configuration.ConfigurationManager" Version="5.0.0" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\Orm\Xtensive.Orm\Xtensive.Orm.csproj" />

Orm/Xtensive.Orm.Tests.Framework/DomainModelExtensions.cs

@@ -81,7 +81,7 @@ public static void Dump(this TypeInfoCollection target)
 
     public static void DumpAncestor(this TypeInfo target, int indent)
     {
-      TypeInfo ancestor = target.GetAncestor();
+      TypeInfo ancestor = target.Ancestor;
       if (ancestor!=null)
         WriteLine(indent + 1, "Ancestor: " + ancestor.Name);
       else {
@@ -92,8 +92,8 @@ public static void DumpAncestor(this TypeInfo target, int indent)
     public static void DumpDescendants(this TypeInfo target, int indent)
     {
       WriteLine(indent, "Descendants:");
-      HashSet<TypeInfo> direct = new HashSet<TypeInfo>(target.GetDescendants());
-      foreach (TypeInfo descendant in target.GetDescendants(true)) {
+      HashSet<TypeInfo> direct = new HashSet<TypeInfo>(target.DirectDescendants);
+      foreach (TypeInfo descendant in target.AllDescendants) {
         if (direct.Contains(descendant))
           WriteLine(indent + 1, descendant.Name + " (direct)");
         else
@@ -104,8 +104,8 @@ public static void DumpDescendants(this TypeInfo target, int indent)
     public static void DumpInterfaces(this TypeInfo target, int indent)
     {
       WriteLine(indent, "Interfaces:");
-      HashSet<TypeInfo> direct = new HashSet<TypeInfo>(target.GetInterfaces());
-      foreach (TypeInfo @interface in target.GetInterfaces(true)) {
+      var direct = target.DirectInterfaces;
+      foreach (TypeInfo @interface in target.AllInterfaces) {
         if (direct.Contains(@interface))
           WriteLine(indent + 1, @interface.Name + " (direct)");
         else
@@ -116,8 +116,8 @@ public static void DumpInterfaces(this TypeInfo target, int indent)
     public static void DumpImplementors(this TypeInfo target, int indent)
     {
       WriteLine(indent, "Implementors:");
-      HashSet<TypeInfo> direct = new HashSet<TypeInfo>(target.GetImplementors());
-      foreach (TypeInfo implementor in target.GetImplementors(true)) {
+      HashSet<TypeInfo> direct = new HashSet<TypeInfo>(target.DirectImplementors);
+      foreach (TypeInfo implementor in target.AllImplementors) {
         if (direct.Contains(implementor))
           WriteLine(indent + 1, implementor.Name + " (direct)");
         else
@@ -163,10 +163,10 @@ public static void Dump(this TypeInfo target, int indent)
       if (target.IsEntity) {
         WriteLine(indent, "Hierarchy: " + target.Hierarchy.Root.Name);
         if (target.Hierarchy.Root!=target)
-          WriteLine(indent, "Ancestor: " + target.GetAncestor().Name);
+          WriteLine(indent, "Ancestor: " + target.Ancestor.Name);
       }
       else if (target.IsInterface) {
-        WriteLine(indent, "Implementors: " + target.GetImplementors().Select(t => t.Name).ToCommaDelimitedString());
+        WriteLine(indent, "Implementors: " + target.DirectImplementors.Select(t => t.Name).ToCommaDelimitedString());
       }
 
       target.DumpMappingName(indent);

Orm/Xtensive.Orm.Tests.Framework/Orm.config

@@ -63,6 +63,9 @@
     <domain name="pgsql130"
             connectionUrl="postgresql://dotest:dotest@localhost:54130/dotest" />
 
+    <domain name="pgsql140"
+            connectionUrl="postgresql://dotest:dotest@localhost:54140/dotest" />
+
     <domain name="oracle10"
             connectionUrl="oracle://dotest:dotest@localhost:5510/ora10" />
 
@@ -149,6 +152,9 @@
     <domain name="pgsql130cs" provider="postgresql"
             connectionString="HOST=localhost;PORT=54130;DATABASE=dotest;USER ID=dotest;PASSWORD=dotest" />
 
+    <domain name="pgsql140cs" provider="postgresql"
+            connectionString="HOST=localhost;PORT=54140;DATABASE=dotest;USER ID=dotest;PASSWORD=dotest" />
+
     <domain name="oracle10cs" provider="oracle"
             connectionString="DATA SOURCE=&quot;(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=localhost)(PORT=5510))(CONNECT_DATA=(SERVICE_NAME=ora10)))&quot;;USER ID=dotest;PASSWORD=dotest" />
 

Orm/Xtensive.Orm.Tests/App.config

@@ -125,15 +125,22 @@
         <ignoreRules>
           <rule database="Other-DO40-Tests" schema="some-schema1" table="table1"/>
           <rule database="some-database" schema="some-schema2" column="column2"/>
+          <rule database="some-database" schema="some-schema2" index="index2"/>
           <rule database="some-database" schema="some-schema3" table="table2" column="col3"/>
+          <rule database="some-database" schema="some-schema3" table="table2" index="index3"/>
           <rule database="another-some-database" table="some-table" />
           <rule database="database1" column ="some-column"/>
+          <rule database="database1" index ="some-index"/>
           <rule schema="schema1" table="table1"/>
           <rule schema="schema1" column="column2"/>
+          <rule schema="schema1" index="index2" />
           <rule schema="schema1" table="table2" column="column3"/>
+          <rule schema="schema1" table="table2" index="index3"/>
           <rule table="table4" column="column3"/>
+          <rule table="table4" index ="index2" />
           <rule table="single-table"/>
           <rule column="single-column"/>
+          <rule index ="single-index" />
         </ignoreRules>
         <databases>
           <database name="main" realName="DO40-Tests" />

Orm/Xtensive.Orm.Tests/Configuration/AppConfigTest.cs

@@ -203,8 +203,8 @@ public void IgnoreRuleConfigTest()
 
       var good = configuration.Clone();
       good.IgnoreRules.Clear();
-      good.IgnoreRules.IgnoreTable("ignored-table").WhenDatabase("Other-DO40-Test").WhenSchema("dbo");
-      good.IgnoreRules.IgnoreColumn("ignored-column");
+      _ = good.IgnoreRules.IgnoreTable("ignored-table").WhenDatabase("Other-DO40-Test").WhenSchema("dbo");
+      _ = good.IgnoreRules.IgnoreColumn("ignored-column");
       good.Lock();
     }
 
@@ -382,13 +382,136 @@ private void ValidateIgnoringConfiguration(DomainConfiguration configuration)
     {
       Assert.That(configuration.DefaultDatabase, Is.EqualTo("main"));
       Assert.That(configuration.DefaultSchema, Is.EqualTo("dbo"));
-      Assert.That(configuration.IgnoreRules.Count, Is.EqualTo(11));
-      var rule = configuration.IgnoreRules[0];
+
+      var rules = configuration.IgnoreRules;
+      Assert.That(rules.Count, Is.EqualTo(18));
+
+      var rule = rules[0];
       Assert.That(rule.Database, Is.EqualTo("Other-DO40-Tests"));
-      var rule2 = configuration.IgnoreRules[2];
-      Assert.That(rule2.Schema, Is.EqualTo("some-schema3"));
-      Assert.That(rule2.Table, Is.EqualTo("table2"));
-      Assert.That(rule2.Column, Is.EqualTo("col3"));
+      Assert.That(rule.Schema, Is.EqualTo("some-schema1"));
+      Assert.That(rule.Table, Is.EqualTo("table1"));
+      Assert.That(rule.Column, Is.Null.Or.Empty);
+      Assert.That(rule.Index, Is.Null.Or.Empty);
+
+      rule = rules[1];
+      Assert.That(rule.Database, Is.EqualTo("some-database"));
+      Assert.That(rule.Schema, Is.EqualTo("some-schema2"));
+      Assert.That(rule.Table, Is.Null.Or.Empty);
+      Assert.That(rule.Column, Is.EqualTo("column2"));
+      Assert.That(rule.Index, Is.Null.Or.Empty);
+
+      rule = rules[2];
+      Assert.That(rule.Database, Is.EqualTo("some-database"));
+      Assert.That(rule.Schema, Is.EqualTo("some-schema2"));
+      Assert.That(rule.Table, Is.Null.Or.Empty);
+      Assert.That(rule.Column, Is.Null.Or.Empty);
+      Assert.That(rule.Index, Is.EqualTo("index2"));
+
+      rule = rules[3];
+      Assert.That(rule.Database, Is.EqualTo("some-database"));
+      Assert.That(rule.Schema, Is.EqualTo("some-schema3"));
+      Assert.That(rule.Table, Is.EqualTo("table2"));
+      Assert.That(rule.Column, Is.EqualTo("col3"));
+      Assert.That(rule.Index, Is.Null.Or.Empty);
+
+      rule = rules[4];
+      Assert.That(rule.Database, Is.EqualTo("some-database"));
+      Assert.That(rule.Schema, Is.EqualTo("some-schema3"));
+      Assert.That(rule.Table, Is.EqualTo("table2"));
+      Assert.That(rule.Column, Is.Null.Or.Empty);
+      Assert.That(rule.Index, Is.EqualTo("index3"));
+
+      rule = rules[5];
+      Assert.That(rule.Database, Is.EqualTo("another-some-database"));
+      Assert.That(rule.Schema, Is.Null.Or.Empty);
+      Assert.That(rule.Table, Is.EqualTo("some-table"));
+      Assert.That(rule.Column, Is.Null.Or.Empty);
+      Assert.That(rule.Index, Is.Null.Or.Empty);
+
+      rule = rules[6];
+      Assert.That(rule.Database, Is.EqualTo("database1"));
+      Assert.That(rule.Schema, Is.Null.Or.Empty);
+      Assert.That(rule.Table, Is.Null.Or.Empty);
+      Assert.That(rule.Column, Is.EqualTo("some-column"));
+      Assert.That(rule.Index, Is.Null.Or.Empty);
+
+      rule = rules[7];
+      Assert.That(rule.Database, Is.EqualTo("database1"));
+      Assert.That(rule.Schema, Is.Null.Or.Empty);
+      Assert.That(rule.Table, Is.Null.Or.Empty);
+      Assert.That(rule.Column, Is.Null.Or.Empty);
+      Assert.That(rule.Index, Is.EqualTo("some-index"));
+
+      rule = rules[8];
+      Assert.That(rule.Database, Is.Null.Or.Empty);
+      Assert.That(rule.Schema, Is.EqualTo("schema1"));
+      Assert.That(rule.Table, Is.EqualTo("table1"));
+      Assert.That(rule.Column, Is.Null.Or.Empty);
+      Assert.That(rule.Index, Is.Null.Or.Empty);
+
+      rule = rules[9];
+      Assert.That(rule.Database, Is.Null.Or.Empty);
+      Assert.That(rule.Schema, Is.EqualTo("schema1"));
+      Assert.That(rule.Table, Is.Null.Or.Empty);
+      Assert.That(rule.Column, Is.EqualTo("column2"));
+      Assert.That(rule.Index, Is.Null.Or.Empty);
+
+      rule = rules[10];
+      Assert.That(rule.Database, Is.Null.Or.Empty);
+      Assert.That(rule.Schema, Is.EqualTo("schema1"));
+      Assert.That(rule.Table, Is.Null.Or.Empty);
+      Assert.That(rule.Column, Is.Null.Or.Empty);
+      Assert.That(rule.Index, Is.EqualTo("index2"));
+
+      rule = rules[11];
+      Assert.That(rule.Database, Is.Null.Or.Empty);
+      Assert.That(rule.Schema, Is.EqualTo("schema1"));
+      Assert.That(rule.Table, Is.EqualTo("table2"));
+      Assert.That(rule.Column, Is.EqualTo("column3"));
+      Assert.That(rule.Index, Is.Null.Or.Empty);
+
+      rule = rules[12];
+      Assert.That(rule.Database, Is.Null.Or.Empty);
+      Assert.That(rule.Schema, Is.EqualTo("schema1"));
+      Assert.That(rule.Table, Is.EqualTo("table2"));
+      Assert.That(rule.Column, Is.Null.Or.Empty);
+      Assert.That(rule.Index, Is.EqualTo("index3"));
+
+      rule = rules[13];
+      Assert.That(rule.Database, Is.Null.Or.Empty);
+      Assert.That(rule.Schema, Is.Null.Or.Empty);
+      Assert.That(rule.Table, Is.EqualTo("table4"));
+      Assert.That(rule.Column, Is.EqualTo("column3"));
+      Assert.That(rule.Index, Is.Null.Or.Empty);
+
+      rule = rules[14];
+      Assert.That(rule.Database, Is.Null.Or.Empty);
+      Assert.That(rule.Schema, Is.Null.Or.Empty);
+      Assert.That(rule.Table, Is.EqualTo("table4"));
+      Assert.That(rule.Column, Is.Null.Or.Empty);
+      Assert.That(rule.Index, Is.EqualTo("index2"));
+
+      rule = rules[15];
+      Assert.That(rule.Database, Is.Null.Or.Empty);
+      Assert.That(rule.Schema, Is.Null.Or.Empty);
+      Assert.That(rule.Table, Is.EqualTo("single-table"));
+      Assert.That(rule.Column, Is.Null.Or.Empty);
+      Assert.That(rule.Index, Is.Null.Or.Empty);
+
+      rule = rules[16];
+      Assert.That(rule.Database, Is.Null.Or.Empty);
+      Assert.That(rule.Schema, Is.Null.Or.Empty);
+      Assert.That(rule.Table, Is.Null.Or.Empty);
+      Assert.That(rule.Column, Is.EqualTo("single-column"));
+      Assert.That(rule.Index, Is.Null.Or.Empty);
+
+      rule = rules[17];
+      Assert.That(rule.Database, Is.Null.Or.Empty);
+      Assert.That(rule.Schema, Is.Null.Or.Empty);
+      Assert.That(rule.Table, Is.Null.Or.Empty);
+      Assert.That(rule.Column, Is.Null.Or.Empty);
+      Assert.That(rule.Index, Is.EqualTo("single-index"));
+
       var databases = configuration.Databases;
       Assert.That(databases.Count, Is.EqualTo(2));
       Assert.That(databases[0].Name, Is.EqualTo("main"));