Sync EF Core to 7.0.0-preview.6.22302.1

Author: roji

Directory.Packages.props

@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
-    <EFCoreVersion>7.0.0-preview.6.22274.5</EFCoreVersion>
-    <MicrosoftExtensionsVersion>7.0.0-preview.5.22272.3</MicrosoftExtensionsVersion>
+    <EFCoreVersion>7.0.0-preview.6.22302.1</EFCoreVersion>
+    <MicrosoftExtensionsVersion>7.0.0-preview.6.22279.1</MicrosoftExtensionsVersion>
     <NpgsqlVersion>7.0.0-preview.5-ci.20220516T154412</NpgsqlVersion>
   </PropertyGroup>
 

src/EFCore.PG/Query/Internal/NpgsqlSetOperationTypeResolutionCompensatingExpressionVisitor.cs

@@ -15,7 +15,6 @@ ShapedQueryExpression shapedQueryExpression
                     Visit(shapedQueryExpression.ShaperExpression)),
             SetOperationBase setOperationExpression => VisitSetOperation(setOperationExpression),
             SelectExpression selectExpression => VisitSelect(selectExpression),
-            TpcTablesExpression tpcTablesExpression => VisitTpcTablesExpression(tpcTablesExpression),
             _ => base.VisitExtension(extensionExpression)
         };
 
@@ -40,40 +39,6 @@ private Expression VisitSetOperation(SetOperationBase setOperationExpression)
         }
     }
 
-#pragma warning disable EF1001
-    private Expression VisitTpcTablesExpression(TpcTablesExpression tpcTablesExpression)
-    {
-        var parentState = _state;
-
-        if (tpcTablesExpression.SelectExpressions.Count < 3)
-        {
-            return base.VisitExtension(tpcTablesExpression);
-        }
-
-        var changed = false;
-        var visitedSelectExpressions = new SelectExpression[tpcTablesExpression.SelectExpressions.Count];
-
-        _state = State.InNestedSetOperation;
-        visitedSelectExpressions[0] = (SelectExpression)Visit(tpcTablesExpression.SelectExpressions[0]);
-        changed |= visitedSelectExpressions[0] != tpcTablesExpression.SelectExpressions[0];
-        _state = State.AlreadyCompensated;
-
-        for (var i = 1; i < tpcTablesExpression.SelectExpressions.Count; i++)
-        {
-            var selectExpression = tpcTablesExpression.SelectExpressions[i];
-            var visitedSelectExpression = (SelectExpression)Visit(tpcTablesExpression.SelectExpressions[i]);
-            visitedSelectExpressions[i] = visitedSelectExpression;
-            changed |= selectExpression != visitedSelectExpression;
-        }
-
-        _state = parentState;
-
-        return changed
-            ? new TpcTablesExpression(tpcTablesExpression.Alias, tpcTablesExpression.EntityType, visitedSelectExpressions)
-            : tpcTablesExpression;
-    }
-#pragma warning restore EF1001
-
     private Expression VisitSelect(SelectExpression selectExpression)
     {
         var changed = false;

test/EFCore.PG.FunctionalTests/BindingInterceptionNpgsqlTest.cs

@@ -0,0 +1,37 @@
+#nullable enable
+
+using Npgsql.EntityFrameworkCore.PostgreSQL.Infrastructure;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Storage.Internal;
+using Npgsql.EntityFrameworkCore.PostgreSQL.TestUtilities;
+
+namespace Npgsql.EntityFrameworkCore.PostgreSQL;
+
+public class BindingInterceptionNpgsqlTest : BindingInterceptionTestBase,
+    IClassFixture<BindingInterceptionNpgsqlTest.BindingInterceptionNpgsqlFixture>
+{
+    public BindingInterceptionNpgsqlTest(BindingInterceptionNpgsqlFixture fixture)
+        : base(fixture)
+    {
+    }
+
+    public class BindingInterceptionNpgsqlFixture : SingletonInterceptorsFixtureBase
+    {
+        protected override string StoreName
+            => "BindingInterception";
+
+        protected override ITestStoreFactory TestStoreFactory
+            => NpgsqlTestStoreFactory.Instance;
+
+        protected override IServiceCollection InjectInterceptors(
+            IServiceCollection serviceCollection,
+            IEnumerable<ISingletonInterceptor> injectedInterceptors)
+            => base.InjectInterceptors(serviceCollection.AddEntityFrameworkNpgsql(), injectedInterceptors);
+
+        public override DbContextOptionsBuilder AddOptions(DbContextOptionsBuilder builder)
+        {
+            new NpgsqlDbContextOptionsBuilder(base.AddOptions(builder))
+                .ExecutionStrategy(d => new NpgsqlExecutionStrategy(d));
+            return builder;
+        }
+    }
+}