select

Author: Ihar Yakimush

README.md

@@ -103,16 +103,17 @@ IQueryable<Product> solrLinq = solr.AsQueryable(setup =>
   Product[] result = solrLinq.Where(p => p.Categories.Any(s => s == "qwe")).ToArray();
   ```
   ### Select
-  - Anonymous type with fields, pseudo field, functions and transformers
+  - Anonymous and regular types with fields, pseudo field, functions and transformers
   ```
   var result = solrLinq.Select(p => 
       new {
               p.Id, 
 	          p.Categories, 
-	          Qwe = Math.Pow(2,2), // function
-	          ValStr = SolrExpr.Transformers.Value("qwe"), // value transformer
-	          Score= SolrExpr.Fields.Score() // score pseudo field 
-	      }).OrderBy(arg => arg.Score).ToSolrQueryResults();
+	          Qwe = Math.Pow(2,2), // will be evaluated locally
+	          ValStr = SolrExpr.Transformers.Value("qwe"), // value transformer evaluated in solr
+	          Score= SolrExpr.Fields.Score() // score pseudo field evaluated in solr
+	      }).OrderBy(arg => arg.Score) // allowed to use expressions evaluated in solr for ordering
+		  .ToSolrQueryResults();
   ```
   ### Select
   - Existing type by member initialization
@@ -123,9 +124,9 @@ IQueryable<Product> solrLinq = solr.AsQueryable(setup =>
   ```
   var result = solrLinq
 	.Where(p => p.Id != null)
-    .Select(p => new {p.Id, p.Price, p.Categories, Qwe = Math.Pow(2, 2)})
+    .Select(p => new {p.Id, p.Price, p.Categories, Score= SolrExpr.Fields.Score()})
     .Where(arg => arg.Categories.Any(s => s == "electronics"))
-    .OrderBy(arg => arg.Id).ThenBy(arg=>arg.Qwe)
+    .OrderBy(arg => arg.Id).ThenBy(arg=>arg.Score) 
     .Select(arg => new {arg.Id})
     .FirstOrDefault(arg2 => arg2.Id != null);
   ```

SolrNet.Linq.IntegrationTests/SelectTests.cs

@@ -236,20 +236,19 @@ public void Product2WithMemberProduct()
         {
             Assert.Throws<SolrConnectionException>(() => Product.SolrOperations.Value.AsQueryable(lo => lo.SetupQueryOptions = qo =>
                 {
-                    Assert.Equal(4, qo.Fields.Count);
-                    Assert.Equal("Price:sum(price,1)", qo.Fields.ElementAt(0));
-                    Assert.Equal("Qwe:pow(2,2)", qo.Fields.ElementAt(1));
-                    Assert.Equal("Id:id", qo.Fields.ElementAt(2));
-                    Assert.Equal("Categories:cat", qo.Fields.ElementAt(3));
+                    Assert.Equal(3, qo.Fields.Count);
+                    Assert.Equal("id", qo.Fields.ElementAt(0));
+                    Assert.Equal("price", qo.Fields.ElementAt(1));
+                    Assert.Equal("v0:score", qo.Fields.ElementAt(2));
 
-                    Assert.Equal(2, qo.OrderBy.Count);
+                    Assert.Equal(3, qo.OrderBy.Count);
                     Assert.Equal("id", qo.OrderBy.ElementAt(0).FieldName);
                     Assert.Equal("sum(price,1)", qo.OrderBy.ElementAt(1).FieldName);
+                    Assert.Equal("sum(score,1)", qo.OrderBy.ElementAt(2).FieldName);
                 }).Where(p => p.Id != null)
                 .Select(p =>
-                    new Product2 {Id = p.Id, Price = p.Price + 1, Categories = p.Categories})
-                .Where(arg => arg.Categories.Any(s => s == "electronics"))
-                .OrderBy(arg => arg.Id).ThenBy(arg => arg.Price)
+                    new Product2 {Id = p.Id, Price = p.Price + 1, Score = SolrExpr.Fields.Score() + 1})
+                .OrderBy(arg => arg.Id).ThenBy(arg => arg.Price).ThenBy(arg => arg.Score)
                 .FirstOrDefault());
         }
     }

SolrNet.Linq/Expressions/Context/SelectContext.cs

@@ -14,7 +14,7 @@ public class SelectContext : MemberContext
         public Dictionary<MemberInfo, string> Members { get; } = new Dictionary<MemberInfo, string>();
         public Dictionary<MemberInfo, string> Aliases { get; } = new Dictionary<MemberInfo, string>();
 
-        public List<Expression> Calculated { get; } = new List<Expression>();
+        public Dictionary<MemberInfo, Expression> Calculated { get; } = new Dictionary<MemberInfo, Expression>();
 
         public SelectContext(NewExpression expression, MemberContext parentContext)
         {
@@ -36,7 +36,7 @@ public SelectContext(NewExpression expression, MemberContext parentContext)
                 }
                 else
                 {
-                    Calculated.Add(argument);
+                    Calculated.Add(expression.Members[i], argument);
                 }
             }            
         }
@@ -60,7 +60,7 @@ public SelectContext(MemberInitExpression expression, MemberContext parentContex
                 }
                 else
                 {
-                    Calculated.Add(binding.Expression);
+                    Calculated.Add(binding.Member, binding.Expression);
                 }
             }
         }
@@ -84,6 +84,11 @@ public override string GetSolrMemberProduct(Expression expression, bool disableF
                 {
                     return Aliases[me.Member];
                 }
+
+                if (Calculated.ContainsKey(me.Member) && disableFunctions == false)
+                {
+                    return ParentContext.GetSolrMemberProduct(Calculated[me.Member]);
+                }
             }
 
             return expression.GetSolrMemberProduct(this, disableFunctions);

SolrNet.Linq/Expressions/MemberExpressionExtensions.cs

@@ -48,7 +48,6 @@ public static class MemberExpressionExtensions
 
         };
 
-
         internal static string GetSolrMemberProduct(this Expression exp, MemberContext context, bool disableFunctions = false)
         {
             try

SolrNet.Linq/SolrNet.Linq.csproj

@@ -13,7 +13,8 @@
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
     <Version>1.3.0</Version>
-    <PackageReleaseNotes>support Any(), Count(), LongCount() methods and its async versions</PackageReleaseNotes>
+    <PackageReleaseNotes>Added support for Select() method. Compatible with OData way of building select expression.
+Added support for Any(), Count(), LongCount() methods and its async versions</PackageReleaseNotes>
   </PropertyGroup>
 
   <ItemGroup>