Skip to content

support teradata dataset in adf #6568

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.

Sign up for GitHub

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

Merged
raych1 merged 2 commits into from
Jul 17, 2019
Merged

support teradata dataset in adf #6568

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4e54925
support teradata dataset in adf
hbzhxying Jul 9, 2019
ba2ad3d
remove Teradata linked service required property
hbzhxying Jul 12, 2019
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
30 changes: 30 additions & 0 deletions ...factory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Dataset.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1182,6 +1182,36 @@
}
}
},
"TeradataTableDataset": {
Copy link
Copy Markdown
Member

@raych1 raych1 Jul 9, 2019

Choose a reason for hiding this comment

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

Some of new definitions added in this PR are not referenced anywhere in datafactory.json. What's the purpose to add them?

Copy link
Copy Markdown
Contributor Author

@xiaoyingQQ xiaoyingQQ Jul 11, 2019

Choose a reason for hiding this comment

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

This is used to help customer create Teradata Table Dataset. It is based on "Dataset", and it will be used in pipeline.

"x-ms-discriminator-value": "TeradataTable",
"description": "The Teradata database dataset.",
"type": "object",
"allOf": [
{
"$ref": "#/definitions/Dataset"
}
],
"properties": {
"typeProperties": {
"description": "Teradata dataset properties.",
"x-ms-client-flatten": true,
"$ref": "#/definitions/TeradataTableDatasetTypeProperties"
}
}
},
"TeradataTableDatasetTypeProperties": {
"description": "Teradata dataset properties.",
"properties": {
"database": {
"type": "object",
"description": "The database name of Teradata. Type: string (or Expression with resultType string)."
},
"table": {
"type": "object",
"description": "The table name of Teradata. Type: string (or Expression with resultType string)."
}
}
},
"AzureMySqlTableDataset": {
"x-ms-discriminator-value": "AzureMySqlTable",
"description": "The Azure MySQL database dataset.",
Expand Down
9 changes: 5 additions & 4 deletions ...y/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/LinkedService.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -937,6 +937,10 @@
"TeradataLinkedServiceTypeProperties": {
"description": "Teradata linked service properties.",
"properties": {
"connectionString": {
"description": "Teradata ODBC connection string. Type: string, SecureString or AzureKeyVaultSecretReference.",
"type": "object"
},
"server": {
"type": "object",
"description": "Server name for connection. Type: string (or Expression with resultType string)."
Expand Down Expand Up @@ -965,10 +969,7 @@
"type": "object",
"description": "The encrypted credential used for authentication. Credentials are encrypted using the integration runtime credential manager. Type: string (or Expression with resultType string)."
}
},
"required": [
"server"
]
}
},
"AzureMLLinkedService": {
"x-ms-discriminator-value": "AzureML",
Expand Down
50 changes: 50 additions & 0 deletions ...actory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Pipeline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1289,6 +1289,56 @@
}
}
},
"TeradataSource": {
"description": "A copy activity Teradata source.",
"type": "object",
"allOf": [
{
"$ref": "#/definitions/CopySource"
}
],
"properties": {
"query": {
"type": "object",
"description": "Teradata query. Type: string (or Expression with resultType string)."
},
"partitionOption": {
"description": "The partition mechanism that will be used for teradata read in parallel.",
"type": "string",
"enum": [
"None",
"Hash",
"DynamicRange"
],
"x-ms-enum": {
"name": "TeradataPartitionOption",
"modelAsString": true
}
},
"partitionSettings": {
"description": "The settings that will be leveraged for teradata source partitioning.",
"$ref": "#/definitions/TeradataPartitionSettings"
}
}
},
"TeradataPartitionSettings": {
"description": "The settings that will be leveraged for teradata source partitioning.",
"type": "object",
"properties": {
"partitionColumnName": {
"type": "object",
"description": "The name of the column that will be used for proceeding range or hash partitioning. Type: string (or Expression with resultType string)."
},
"partitionUpperBound": {
"type": "object",
"description": "The maximum value of column specified in partitionColumnName that will be used for proceeding range partitioning. Type: string (or Expression with resultType string)."
},
"partitionLowerBound": {
"type": "object",
"description": "The minimum value of column specified in partitionColumnName that will be used for proceeding range partitioning. Type: string (or Expression with resultType string)."
}
}
},
"WebSource": {
"description": "A copy activity source for web page table.",
"type": "object",
Expand Down