Merge pull request #219 from servicetitan/upstream/ExceptionOnDistinctBy

alex-kulakov · web-flow · commit 29d716d86f0b · 2022-03-03T11:58:43.000+05:00
Throw exception on unsupported IQueryable.DistinctBy() expressions
diff --git a/Orm/Xtensive.Orm/Linq/QueryableMethodKind.cs b/Orm/Xtensive.Orm/Linq/QueryableMethodKind.cs
@@ -30,6 +30,7 @@ public enum QueryableMethodKind
     Count,
     DefaultIfEmpty,
     Distinct,
+    DistinctBy,
     ElementAt,
     ElementAtOrDefault,
     Except,
diff --git a/Orm/Xtensive.Orm/Orm/Linq/Translator.Queryable.cs b/Orm/Xtensive.Orm/Orm/Linq/Translator.Queryable.cs
@@ -132,6 +132,8 @@ protected override Expression VisitQueryableMethod(MethodCallExpression mc, Quer
             }
 
             break;
+          case QueryableMethodKind.DistinctBy:
+            throw new NotSupportedException(Strings.ExUnsupportedDistinctBy);
           case QueryableMethodKind.First:
           case QueryableMethodKind.FirstOrDefault:
           case QueryableMethodKind.Single:
diff --git a/Orm/Xtensive.Orm/Strings.Designer.cs b/Orm/Xtensive.Orm/Strings.Designer.cs
diff --git a/Orm/Xtensive.Orm/Strings.resx b/Orm/Xtensive.Orm/Strings.resx
@@ -2573,4 +2573,7 @@ Error: {1}</value>
   <data name="ExTagDoesNotSupportQueryProviderOfTypeX" xml:space="preserve">
     <value>'Tag' does not support query provider of type '{0}'.</value>
   </data>
+  <data name="ExUnsupportedDistinctBy" xml:space="preserve">
+    <value>IQueryable.DistinctBy() extension is not supported. Use '.AsEnumerable().DistinctBy()' instead.</value>
+  </data>
 </root>

Original file line number	Diff line number	Diff line change
`@@ -132,6 +132,8 @@ protected override Expression VisitQueryableMethod(MethodCallExpression mc, Quer`
`132`	`132`	`}`
`133`	`133`
`134`	`134`	`break;`
	`135`	`+ case QueryableMethodKind.DistinctBy:`
	`136`	`+ throw new NotSupportedException(Strings.ExUnsupportedDistinctBy);`
`135`	`137`	`case QueryableMethodKind.First:`
`136`	`138`	`case QueryableMethodKind.FirstOrDefault:`
`137`	`139`	`case QueryableMethodKind.Single:`