Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Data Factory] Add readBehavior property to Salesforce Source in SDK #3925

Merged
merged 6 commits into from
Dec 13, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -2117,6 +2117,7 @@ public class PipelineJsonSamples : JsonSampleCollection<PipelineJsonSamples>
{
""type"": ""SalesforceSource"",
""query"":""select Id from table"",
""readBehavior"": ""QueryAll""
},
""sink"":
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,14 @@ public SalesforceSource()
/// ((\d+)\.)?(\d\d):(60|([0-5][0-9])):(60|([0-5][0-9])).</param>
/// <param name="query">Database query. Type: string (or Expression
/// with resultType string).</param>
public SalesforceSource(IDictionary<string, object> additionalProperties = default(IDictionary<string, object>), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object query = default(object))
/// <param name="readBehavior">The read behavior for the operation.
/// Default is Query. Possible values include: 'Query',
/// 'QueryAll'</param>
public SalesforceSource(IDictionary<string, object> additionalProperties = default(IDictionary<string, object>), object sourceRetryCount = default(object), object sourceRetryWait = default(object), object query = default(object), string readBehavior = default(string))
: base(additionalProperties, sourceRetryCount, sourceRetryWait)
{
Query = query;
ReadBehavior = readBehavior;
CustomInit();
}

Expand All @@ -59,5 +63,12 @@ public SalesforceSource()
[JsonProperty(PropertyName = "query")]
public object Query { get; set; }

/// <summary>
/// Gets or sets the read behavior for the operation. Default is Query.
/// Possible values include: 'Query', 'QueryAll'
/// </summary>
[JsonProperty(PropertyName = "readBehavior")]
public string ReadBehavior { get; set; }

}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
// <auto-generated>
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License. See License.txt in the project root for
// license information.
//
// Code generated by Microsoft (R) AutoRest Code Generator.
// Changes may cause incorrect behavior and will be lost if the code is
// regenerated.
// </auto-generated>

namespace Microsoft.Azure.Management.DataFactory.Models
{

/// <summary>
/// Defines values for SalesforceSourceReadBehavior.
/// </summary>
public static class SalesforceSourceReadBehavior
{
public const string Query = "Query";
public const string QueryAll = "QueryAll";
}
}
5 changes: 5 additions & 0 deletions src/SDKs/DataFactory/Management.DataFactory/changelog.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
# Changelog for the Azure Data Factory V2 .NET SDK

## Version 0.3.1-preview

### Feature Additions
* Add readBehavior to Salesforce Source

## Version 0.3.0-preview

### Feature Additions
Expand Down
5 changes: 2 additions & 3 deletions src/SDKs/_metadata/datafactory_resource-manager.txt
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
2017-12-07 02:33:12 UTC
2017-12-08 05:40:35 UTC

1) azure-rest-api-specs repository information
GitHub user: Azure
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@smilenow I don't see the commit Id for the spec that is part of the meta data file?
Are you generating from the merged spec?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@shahabhijeet Yes, I was generating from the Azure latest public repo yesterday, and didn't modify anything in this file. Do you mean it should input a certain commit id when using generate.cmd?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@shahabhijeet , shall we go ahead with this PR? Or do you need a exact commit id when generating the SDK from the swagger spec?

Branch: current
Commit: e2be3ff347fe3b132303ce5768ead20c136152a5

2) AutoRest information
Requested version: latest
Bootstrapper version: C:\Users\haoqian\AppData\Roaming\npm `-- [email protected]
Bootstrapper version: C:\Users\jiayin\AppData\Roaming\npm `-- [email protected]
Latest installed version: