Allow fetching $descriptors and $permissions in LINQ

Author: NathanBaulch

Saleslogix.SData.Client.Test/Linq/SDataQueryModelVisitorTests.cs

@@ -366,6 +366,34 @@ public void ResultOperator_Fetch_Multiple_Test()
             Assert.That(visitor.Include, Is.EqualTo("Address,Address/Street"));
         }
 
+        [Test]
+        public void ResultOperator_Fetch_Descriptor_Test()
+        {
+            var builder = new QueryModelBuilder();
+            builder.AddClause(new MainFromClause("x", typeof(Contact), Expression.Constant(null)));
+            builder.AddClause(new SelectClause(Expression.Constant(null)));
+            builder.AddResultOperator(new FetchResultOperator(GetExpression((Contact c) => c.Descriptor)));
+
+            var visitor = new SDataQueryModelVisitor();
+            visitor.VisitQueryModel(builder.Build());
+
+            Assert.That(visitor.Include, Is.EqualTo("$descriptors"));
+        }
+
+        [Test]
+        public void ResultOperator_Fetch_Permissions_Test()
+        {
+            var builder = new QueryModelBuilder();
+            builder.AddClause(new MainFromClause("x", typeof(Contact), Expression.Constant(null)));
+            builder.AddClause(new SelectClause(Expression.Constant(null)));
+            builder.AddResultOperator(new FetchResultOperator(GetExpression((Contact c) => c.Permissions)));
+
+            var visitor = new SDataQueryModelVisitor();
+            visitor.VisitQueryModel(builder.Build());
+
+            Assert.That(visitor.Include, Is.EqualTo("$permissions"));
+        }
+
         [Test]
         public void ResultOperator_WithPrecedence_Test()
         {

Saleslogix.SData.Client.Test/Model/Contact.cs

@@ -7,6 +7,10 @@ public class Contact
     {
         [SDataProtocolProperty]
         public string Key { get; set; }
+        [SDataProtocolProperty]
+        public string Descriptor { get; set; }
+        [SDataProtocolProperty]
+        public IList<SDataPermission> Permissions { get; set; }
         public ContactCivility? Civility { get; set; }
         public string FirstName { get; set; }
         public string LastName { get; set; }

Saleslogix.SData.Client/Linq/PropertyPathExtractionVisitor.cs

@@ -174,9 +174,17 @@ private void CompletePath()
         {
             if (_parts.Count > 0)
             {
-                if (!_includeProtocolProps && _parts[0].StartsWith("$", StringComparison.Ordinal))
+                if (!_includeProtocolProps)
                 {
-                    _parts.RemoveAt(0);
+                    if (!_selectMode && _parts.Count == 1 && _parts[0] == "$descriptor")
+                    {
+                        _parts[0] += "s";
+                    }
+                    else if (_parts[0].StartsWith("$", StringComparison.Ordinal) &&
+                             !(!_selectMode && _parts.Count == 1 && _parts[0] == "$permissions"))
+                    {
+                        _parts.RemoveAt(0);
+                    }
                 }
 
                 if (_parts.Count > 0)

Saleslogix.SData.Client/Properties/AssemblyInfo.cs

@@ -26,7 +26,7 @@
 // by using the '*' as shown below:
 
 [assembly: AssemblyVersion("2.0")]
-[assembly: AssemblyFileVersion("2.0.1.1561")]
+[assembly: AssemblyFileVersion("2.0.1.1562")]
 [assembly: NeutralResourcesLanguage("en-US")]
 [assembly: AssemblyInformationalVersion("2.0")]
 [assembly: InternalsVisibleTo("Saleslogix.SData.Client.Test, PublicKey=" +