Skip to content

Commit ef0f731

Browse files
committed
Include payload control args in $batch item Id and Url properties
1 parent e56597a commit ef0f731

File tree

3 files changed

+9
-4
lines changed

3 files changed

+9
-4
lines changed

Saleslogix.SData.Client.Test/SDataClientTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ public void Execute_Batch_Test()
149149
Assert.That(resources[0].HttpMethod, Is.EqualTo(HttpMethod.Post));
150150
Assert.That(resources[1].HttpMethod, Is.EqualTo(HttpMethod.Put));
151151
Assert.That(resources[0].Url, Is.Null);
152-
Assert.That(new SDataUri(resources[1].Url).LastPathSegment.Selector, Is.EqualTo("'key2'"));
152+
Assert.That(resources[1].Url, Is.EqualTo(new Uri("test://dummy/path('key2')?include=include2&select=select2&precedence=2")));
153153
Assert.That(requestMock.Object.ContentType, Is.EqualTo(MediaType.ImageTiff));
154154
Assert.That(resources[0].IfMatch, Is.EqualTo("etag1"));
155155
Assert.That(resources[1].IfMatch, Is.EqualTo("etag2"));

Saleslogix.SData.Client/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@
2525
// You can specify all the values or you can default the Build and Revision Numbers
2626
// by using the '*' as shown below:
2727

28-
[assembly: AssemblyVersion("2.0.1.1546")]
29-
[assembly: AssemblyFileVersion("2.0.1.1546")]
28+
[assembly: AssemblyVersion("2.0.1.1547")]
29+
[assembly: AssemblyFileVersion("2.0.1.1547")]
3030
[assembly: NeutralResourcesLanguage("en-US")]
3131
[assembly: AssemblyInformationalVersion("2.0")]
3232
[assembly: InternalsVisibleTo("Saleslogix.SData.Client.Test, PublicKey=" +

Saleslogix.SData.Client/SDataClient.cs

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -368,7 +368,12 @@ private SDataRequest CreateBatchRequest(ICollection<SDataParameters> items)
368368
throw new SDataClientException("A selector must be specified for GET, PUT and DELETE batch requests");
369369
}
370370

371-
var itemUri = new SDataUri(Uri);
371+
var itemUri = new SDataUri(Uri)
372+
{
373+
Include = parms.Include,
374+
Select = parms.Select,
375+
Precedence = parms.Precedence
376+
};
372377
if (path != null)
373378
{
374379
itemUri.AppendPath(path);

0 commit comments

Comments
 (0)