Fix some compilation time warning

yang-er · Dec 12, 2021 · 6231a79 · 6231a79
1 parent 89dd492
commit 6231a79
Show file tree

Hide file tree

Showing 11 changed files with 17 additions and 37 deletions.
diff --git a/src/Abstraction/Query/ParameterExtractingExpressionVisitor.cs b/src/Abstraction/Query/ParameterExtractingExpressionVisitor.cs
@@ -603,7 +603,10 @@ private sealed class EvaluatableExpressionFindingExpressionVisitor : ExpressionV
             private readonly IEvaluatableExpressionFilter _evaluatableExpressionFilter;
             private readonly ISet<ParameterExpression> _allowedParameters = new HashSet<ParameterExpression>();
             private readonly IModel _model;
+
+#if EFCORE50 || EFCORE60
             private readonly bool _parameterize;
+#endif
 
             private bool _evaluatable;
             private bool _containsClosure;
@@ -619,8 +622,6 @@ public EvaluatableExpressionFindingExpressionVisitor(
                 _model = model;
 #if EFCORE50 || EFCORE60
                 _parameterize = parameterize;
-#elif EFCORE31
-                _parameterize = false;
 #endif
             }
 

diff --git a/src/MySql/EFCore.Bulk.MySql-3.1.csproj b/src/MySql/EFCore.Bulk.MySql-3.1.csproj
@@ -10,6 +10,8 @@
 
   <ItemGroup>
     <Compile Include="..\Relational\Provider\**" />
+    <Compile Remove="..\Relational\Provider\ParameterBasedSqlProcessor.cs" />
+	<Compile Remove="QueryCompilationContextFactory.cs" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/PostgreSql/EFCore.Bulk.PostgreSql-3.1.csproj b/src/PostgreSql/EFCore.Bulk.PostgreSql-3.1.csproj
@@ -10,6 +10,8 @@
 
   <ItemGroup>
     <Compile Include="..\Relational\Provider\**" />
+    <Compile Remove="..\Relational\Provider\ParameterBasedSqlProcessor.cs" />
+	<Compile Remove="QueryCompilationContextFactory.cs" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/Relational/Provider/ParameterBasedSqlProcessor.cs b/src/Relational/Provider/ParameterBasedSqlProcessor.cs
@@ -1,6 +1,4 @@
-#if EFCORE50 || EFCORE60
-
-using Microsoft.EntityFrameworkCore.Bulk;
+using Microsoft.EntityFrameworkCore.Bulk;
 using Microsoft.EntityFrameworkCore.Query.SqlExpressions;
 using Microsoft.EntityFrameworkCore.Utilities;
 using System.Collections.Generic;
@@ -286,5 +284,3 @@ public virtual RelationalParameterBasedSqlProcessor Create(bool useRelationalNul
             => new RelationalBulkParameterBasedSqlProcessor(_dependencies, useRelationalNulls, _options);
     }
 }
-
-#endif
diff --git a/src/Relational/Reduce/ColumnRewritingVisitor.cs b/src/Relational/Reduce/ColumnRewritingVisitor.cs
@@ -45,14 +45,6 @@ public IDisposable Setup(TableReferenceExpression from, TableReferenceExpression
             return new ResettingDisposable(this);
         }
 
-#if EFCORE60
-        [Obsolete]
-        public IDisposable Setup(TableExpressionBase from, TableExpressionBase to)
-        {
-            throw new NotImplementedException();
-        }
-#endif
-
         public IDisposable Setup(TableReferenceExpression from, IReadOnlyDictionary<string, Expression> to)
         {
             _from = Check.NotNull(from, nameof(from));

diff --git a/src/Relational/Reduce/ProjectionBindingPruningExpressionVisitor.cs b/src/Relational/Reduce/ProjectionBindingPruningExpressionVisitor.cs
@@ -107,23 +107,6 @@ protected virtual Expression VisitProjectionBinding(ProjectionBindingExpression
                     }
                 }
 
-                return projectionBindingExpression;
-            }
-#elif EFCORE60
-            else if (projectionBindingExpression.IndexMap != null)
-            {
-                var links = projectionBindingExpression.IndexMap;
-                if (_processed.Add((IDictionary<IProperty, int>)links))
-                {
-                    var properties = links.ToList();
-                    foreach (var link in properties)
-                    {
-                        var rawIndex = link.Value;
-                        var property = link.Key;
-                        ((IDictionary<IProperty, int>)links)[property] = _remappedIndex[rawIndex];
-                    }
-                }
-
                 return projectionBindingExpression;
             }
 #endif

diff --git a/src/Relational/Reduce/ShaperQueryExpressionReplacingVisitor.cs b/src/Relational/Reduce/ShaperQueryExpressionReplacingVisitor.cs
@@ -25,10 +25,12 @@ protected override Expression VisitExtension(Expression node)
                 {
                     return new ProjectionBindingExpression(_new, proj.ProjectionMember, proj.Type);
                 }
+#if EFCORE31 || EFCORE50
                 else if (proj.IndexMap != null)
                 {
                     return new ProjectionBindingExpression(_new, proj.IndexMap);
                 }
+#endif
             }
 
             return node == _origin ? _new : base.VisitExtension(node);

diff --git a/src/SqlServer/EFCore.Bulk.SqlServer-3.1.csproj b/src/SqlServer/EFCore.Bulk.SqlServer-3.1.csproj
@@ -10,6 +10,9 @@
 
   <ItemGroup>
     <Compile Include="..\Relational\Provider\**" />
+    <Compile Remove="..\Relational\Provider\ParameterBasedSqlProcessor.cs" />
+	<Compile Remove="QueryCompilationContextFactory.cs" />
+	<Compile Remove="QueryableMethodTranslatingExpressionVisitor.cs" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/SqlServer/EFCore.Bulk.SqlServer-5.0.csproj b/src/SqlServer/EFCore.Bulk.SqlServer-5.0.csproj
@@ -10,6 +10,7 @@
 
   <ItemGroup>
     <Compile Include="..\Relational\Provider\**" />
+	<Compile Remove="QueryableMethodTranslatingExpressionVisitor.cs" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/SqlServer/QueryableMethodTranslatingExpressionVisitor.cs b/src/SqlServer/QueryableMethodTranslatingExpressionVisitor.cs
@@ -1,6 +1,4 @@
-#if EFCORE60
-
-using Microsoft.EntityFrameworkCore.Bulk;
+using Microsoft.EntityFrameworkCore.Bulk;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Query;
 using Microsoft.EntityFrameworkCore.SqlServer.Query.Internal;
@@ -100,5 +98,3 @@ public QueryableMethodTranslatingExpressionVisitor Create(QueryCompilationContex
                 _anonymousExpressionFactory);
     }
 }
-
-#endif
diff --git a/src/Sqlite/EFCore.Bulk.Sqlite-3.1.csproj b/src/Sqlite/EFCore.Bulk.Sqlite-3.1.csproj
@@ -10,6 +10,8 @@
 
   <ItemGroup>
     <Compile Include="..\Relational\Provider\**" />
+    <Compile Remove="..\Relational\Provider\ParameterBasedSqlProcessor.cs" />
+	<Compile Remove="QueryCompilationContextFactory.cs" />
   </ItemGroup>
 
   <ItemGroup>