From dd47986e0c0016053684177de1f81332144f531c Mon Sep 17 00:00:00 2001 From: Jingshu Pan Date: Thu, 12 Aug 2021 10:24:24 +0800 Subject: [PATCH 1/7] =?UTF-8?q?(Do=20Not=20Merge)=E3=80=90DataFactory?= =?UTF-8?q?=E3=80=91Support=20AmazonRdsForOracle=20Connector?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../2018-06-01/entityTypes/Dataset.json | 30 ++++++++ .../2018-06-01/entityTypes/LinkedService.json | 40 +++++++++++ .../2018-06-01/entityTypes/Pipeline.json | 69 +++++++++++++++++++ .../entityTypes/Dataset.json | 30 ++++++++ .../entityTypes/LinkedService.json | 40 +++++++++++ .../entityTypes/Pipeline.json | 69 +++++++++++++++++++ 6 files changed, 278 insertions(+) diff --git a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Dataset.json b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Dataset.json index 466271b794e9..5872ba443b3b 100644 --- a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Dataset.json +++ b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Dataset.json @@ -1724,6 +1724,36 @@ } } }, + "AmazonRdsForOracleTableDataset": { + "x-ms-discriminator-value": "AmazonRdsForOracleTable", + "description": "The AmazonRdsForOracle database dataset.", + "type": "object", + "allOf": [ + { + "$ref": "#/definitions/Dataset" + } + ], + "properties": { + "typeProperties": { + "description": "AmazonRdsForOracle dataset properties.", + "x-ms-client-flatten": true, + "$ref": "#/definitions/AmazonRdsForOracleTableDatasetTypeProperties" + } + } + }, + "AmazonRdsForOracleTableDatasetTypeProperties": { + "description": "AmazonRdsForOracle dataset properties.", + "properties": { + "schema": { + "type": "object", + "description": "The schema name of the AmazonRdsForOracle database. Type: string (or Expression with resultType string)." + }, + "table": { + "type": "object", + "description": "The table name of the AmazonRdsForOracle database. Type: string (or Expression with resultType string)." + } + } + }, "TeradataTableDataset": { "x-ms-discriminator-value": "TeradataTable", "description": "The Teradata database dataset.", diff --git a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/LinkedService.json b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/LinkedService.json index bde4d26c0db9..edb58b96673b 100644 --- a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/LinkedService.json +++ b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/LinkedService.json @@ -1239,6 +1239,46 @@ "connectionString" ] }, + "AmazonRdsForOracleLinkedService": { + "x-ms-discriminator-value": "AmazonRdsForOracle", + "description": "AmazonRdsForOracle database.", + "type": "object", + "allOf": [ + { + "$ref": "#/definitions/LinkedService" + } + ], + "properties": { + "typeProperties": { + "description": "AmazonRdsForOracle database linked service properties.", + "x-ms-client-flatten": true, + "$ref": "#/definitions/AmazonRdsForLinkedServiceTypeProperties" + } + }, + "required": [ + "typeProperties" + ] + }, + "AmazonRdsForLinkedServiceTypeProperties": { + "description": "AmazonRdsForOracle database linked service properties.", + "properties": { + "connectionString": { + "description": "The connection string. Type: string, SecureString or AzureKeyVaultSecretReference.", + "type": "object" + }, + "password": { + "$ref": "../datafactory.json#/definitions/SecretBase", + "description": "The Azure key vault secret reference of password in connection string." + }, + "encryptedCredential": { + "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": [ + "connectionString" + ] + }, "AzureMySqlLinkedService": { "x-ms-discriminator-value": "AzureMySql", "description": "Azure MySQL database linked service.", diff --git a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Pipeline.json b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Pipeline.json index 384bdf1ee640..7e07a3f7422b 100644 --- a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Pipeline.json +++ b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Pipeline.json @@ -2683,6 +2683,75 @@ } } }, + "AmazonRdsForOracleSource": { + "description": "A copy activity AmazonRdsForOracle source.", + "type": "object", + "allOf": [ + { + "$ref": "#/definitions/CopySource" + } + ], + "properties": { + "oracleReaderQuery": { + "type": "object", + "description": "AmazonRdsForOracle reader query. Type: string (or Expression with resultType string)." + }, + "queryTimeout": { + "type": "object", + "description": "Query timeout. Type: string (or Expression with resultType string), pattern: ((\\d+)\\.)?(\\d\\d):(60|([0-5][0-9])):(60|([0-5][0-9]))." + }, + "partitionOption": { + "type": "object", + "description": "The partition mechanism that will be used for AmazonRdsForOracle read in parallel. Type: string (or Expression with resultType string)." + }, + "partitionSettings": { + "description": "The settings that will be leveraged for AmazonRdsForOracle source partitioning.", + "$ref": "#/definitions/AmazonRdsForOraclePartitionSettings" + }, + "additionalColumns": { + "type": "object", + "description": "Specifies the additional columns to be added to source data. Type: array of objects(AdditionalColumns) (or Expression with resultType array of objects)." + } + } + }, + "AmazonRdsForOraclePartitionOption": { + "type": "string", + "enum": [ + "None", + "PhysicalPartitionsOfTable", + "DynamicRange" + ], + "x-ms-enum": { + "name": "AmazonRdsForOraclePartitionOption", + "modelAsString": true + } + }, + "AmazonRdsForOraclePartitionSettings": { + "description": "The settings that will be leveraged for AmazonRdsForOracle source partitioning.", + "type": "object", + "properties": { + "partitionNames": { + "type": "object", + "items": { + "type": "object", + "description": "Type: string (or Expression with resultType string)." + }, + "description": "Names of the physical partitions of AmazonRdsForOracle table. " + }, + "partitionColumnName": { + "type": "object", + "description": "The name of the column in integer type that will be used for proceeding range partitioning. Type: string (or Expression with resultType string)." + }, + "partitionUpperBound": { + "type": "object", + "description": "The maximum value of column specificed 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 specificed in partitionColumnName that will be used for proceeding range partitioning. Type: string (or Expression with resultType string)." + } + } + }, "TeradataSource": { "description": "A copy activity Teradata source.", "type": "object", diff --git a/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/entityTypes/Dataset.json b/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/entityTypes/Dataset.json index b5c0b351bead..34c40675f24d 100644 --- a/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/entityTypes/Dataset.json +++ b/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/entityTypes/Dataset.json @@ -1706,6 +1706,36 @@ } } }, + "AmazonRdsForOracleTableDataset": { + "x-ms-discriminator-value": "AmazonRdsForOracleTable", + "description": "The AmazonRdsForOracle database dataset.", + "type": "object", + "allOf": [ + { + "$ref": "#/definitions/Dataset" + } + ], + "properties": { + "typeProperties": { + "description": "AmazonRdsForOracle dataset properties.", + "x-ms-client-flatten": true, + "$ref": "#/definitions/AmazonRdsForOracleTableDatasetTypeProperties" + } + } + }, + "AmazonRdsForOracleTableDatasetTypeProperties": { + "description": "AmazonRdsForOracle dataset properties.", + "properties": { + "schema": { + "type": "object", + "description": "The schema name of the AmazonRdsForOracle database. Type: string (or Expression with resultType string)." + }, + "table": { + "type": "object", + "description": "The table name of the AmazonRdsForOracle database. Type: string (or Expression with resultType string)." + } + } + }, "TeradataTableDataset": { "x-ms-discriminator-value": "TeradataTable", "description": "The Teradata database dataset.", diff --git a/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/entityTypes/LinkedService.json b/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/entityTypes/LinkedService.json index 6aa22cfb0fee..0cd9cdc91625 100644 --- a/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/entityTypes/LinkedService.json +++ b/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/entityTypes/LinkedService.json @@ -1088,6 +1088,46 @@ "connectionString" ] }, + "AmazonRdsForOracleLinkedService": { + "x-ms-discriminator-value": "AmazonRdsForOracle", + "description": "AmazonRdsForOracle database.", + "type": "object", + "allOf": [ + { + "$ref": "#/definitions/LinkedService" + } + ], + "properties": { + "typeProperties": { + "description": "AmazonRdsForOracle database linked service properties.", + "x-ms-client-flatten": true, + "$ref": "#/definitions/AmazonRdsForLinkedServiceTypeProperties" + } + }, + "required": [ + "typeProperties" + ] + }, + "AmazonRdsForLinkedServiceTypeProperties": { + "description": "AmazonRdsForOracle database linked service properties.", + "properties": { + "connectionString": { + "description": "The connection string. Type: string, SecureString or AzureKeyVaultSecretReference.", + "type": "object" + }, + "password": { + "$ref": "../datafactory.json#/definitions/SecretBase", + "description": "The Azure key vault secret reference of password in connection string." + }, + "encryptedCredential": { + "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": [ + "connectionString" + ] + }, "AzureMySqlLinkedService": { "x-ms-discriminator-value": "AzureMySql", "description": "Azure MySQL database linked service.", diff --git a/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/entityTypes/Pipeline.json b/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/entityTypes/Pipeline.json index e781ade499da..d538401e5b2e 100644 --- a/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/entityTypes/Pipeline.json +++ b/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/entityTypes/Pipeline.json @@ -2629,6 +2629,75 @@ } } }, + "AmazonRdsForOracleSource": { + "description": "A copy activity AmazonRdsForOracle source.", + "type": "object", + "allOf": [ + { + "$ref": "#/definitions/CopySource" + } + ], + "properties": { + "oracleReaderQuery": { + "type": "object", + "description": "AmazonRdsForOracle reader query. Type: string (or Expression with resultType string)." + }, + "queryTimeout": { + "type": "object", + "description": "Query timeout. Type: string (or Expression with resultType string), pattern: ((\\d+)\\.)?(\\d\\d):(60|([0-5][0-9])):(60|([0-5][0-9]))." + }, + "partitionOption": { + "type": "object", + "description": "The partition mechanism that will be used for AmazonRdsForOracle read in parallel. Type: string (or Expression with resultType string)." + }, + "partitionSettings": { + "description": "The settings that will be leveraged for AmazonRdsForOracle source partitioning.", + "$ref": "#/definitions/AmazonRdsForOraclePartitionSettings" + }, + "additionalColumns": { + "type": "object", + "description": "Specifies the additional columns to be added to source data. Type: array of objects(AdditionalColumns) (or Expression with resultType array of objects)." + } + } + }, + "AmazonRdsForOraclePartitionOption": { + "type": "string", + "enum": [ + "None", + "PhysicalPartitionsOfTable", + "DynamicRange" + ], + "x-ms-enum": { + "name": "AmazonRdsForOraclePartitionOption", + "modelAsString": true + } + }, + "AmazonRdsForOraclePartitionSettings": { + "description": "The settings that will be leveraged for AmazonRdsForOracle source partitioning.", + "type": "object", + "properties": { + "partitionNames": { + "type": "object", + "items": { + "type": "object", + "description": "Type: string (or Expression with resultType string)." + }, + "description": "Names of the physical partitions of AmazonRdsForOracle table. " + }, + "partitionColumnName": { + "type": "object", + "description": "The name of the column in integer type that will be used for proceeding range partitioning. Type: string (or Expression with resultType string)." + }, + "partitionUpperBound": { + "type": "object", + "description": "The maximum value of column specificed 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 specificed in partitionColumnName that will be used for proceeding range partitioning. Type: string (or Expression with resultType string)." + } + } + }, "TeradataSource": { "description": "A copy activity Teradata source.", "type": "object", From 3b74944985097819736c1e44eb71c88329192562 Mon Sep 17 00:00:00 2001 From: Jingshu Pan Date: Thu, 12 Aug 2021 10:35:43 +0800 Subject: [PATCH 2/7] fix --- .../stable/2018-06-01/entityTypes/Dataset.json | 1 + .../stable/2018-06-01/entityTypes/LinkedService.json | 1 + .../preview/2019-06-01-preview/entityTypes/Dataset.json | 1 + .../preview/2019-06-01-preview/entityTypes/LinkedService.json | 3 ++- 4 files changed, 5 insertions(+), 1 deletion(-) diff --git a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Dataset.json b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Dataset.json index 5872ba443b3b..4156473f6714 100644 --- a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Dataset.json +++ b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Dataset.json @@ -1743,6 +1743,7 @@ }, "AmazonRdsForOracleTableDatasetTypeProperties": { "description": "AmazonRdsForOracle dataset properties.", + "type": "object", "properties": { "schema": { "type": "object", diff --git a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/LinkedService.json b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/LinkedService.json index edb58b96673b..f135cb6b8334 100644 --- a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/LinkedService.json +++ b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/LinkedService.json @@ -1261,6 +1261,7 @@ }, "AmazonRdsForLinkedServiceTypeProperties": { "description": "AmazonRdsForOracle database linked service properties.", + "type": "object", "properties": { "connectionString": { "description": "The connection string. Type: string, SecureString or AzureKeyVaultSecretReference.", diff --git a/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/entityTypes/Dataset.json b/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/entityTypes/Dataset.json index 34c40675f24d..a839a636a043 100644 --- a/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/entityTypes/Dataset.json +++ b/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/entityTypes/Dataset.json @@ -1725,6 +1725,7 @@ }, "AmazonRdsForOracleTableDatasetTypeProperties": { "description": "AmazonRdsForOracle dataset properties.", + "type": "object", "properties": { "schema": { "type": "object", diff --git a/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/entityTypes/LinkedService.json b/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/entityTypes/LinkedService.json index 0cd9cdc91625..f61411a71058 100644 --- a/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/entityTypes/LinkedService.json +++ b/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/entityTypes/LinkedService.json @@ -1110,13 +1110,14 @@ }, "AmazonRdsForLinkedServiceTypeProperties": { "description": "AmazonRdsForOracle database linked service properties.", + "type": "object", "properties": { "connectionString": { "description": "The connection string. Type: string, SecureString or AzureKeyVaultSecretReference.", "type": "object" }, "password": { - "$ref": "../datafactory.json#/definitions/SecretBase", + "$ref": "../artifacts.json#/definitions/SecretBase", "description": "The Azure key vault secret reference of password in connection string." }, "encryptedCredential": { From bd491233d267aabe7907dda75c9326358691b334 Mon Sep 17 00:00:00 2001 From: Jingshu Pan Date: Thu, 12 Aug 2021 11:22:06 +0800 Subject: [PATCH 3/7] fix --- custom-words.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/custom-words.txt b/custom-words.txt index 588440560795..f866fd9d8e0b 100644 --- a/custom-words.txt +++ b/custom-words.txt @@ -2260,3 +2260,4 @@ XLSM DOCM multislot Tebibytes +partitionColumnName From 26dcf713570a113238ebabd3e5b1c3cf8e426a04 Mon Sep 17 00:00:00 2001 From: Jingshu Pan Date: Thu, 12 Aug 2021 11:27:01 +0800 Subject: [PATCH 4/7] fix --- custom-words.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/custom-words.txt b/custom-words.txt index f866fd9d8e0b..b31094a3cba0 100644 --- a/custom-words.txt +++ b/custom-words.txt @@ -2260,4 +2260,4 @@ XLSM DOCM multislot Tebibytes -partitionColumnName +specificed From 84d8f3ee9777d7833794f06c7aa6b0b9798936f8 Mon Sep 17 00:00:00 2001 From: Jingshu Pan Date: Thu, 12 Aug 2021 12:37:51 +0800 Subject: [PATCH 5/7] fix --- cSpell.json | 12 ++++++++++++ custom-words.txt | 1 - 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/cSpell.json b/cSpell.json index 9a95be8b2983..a813da69e69d 100644 --- a/cSpell.json +++ b/cSpell.json @@ -839,6 +839,18 @@ "Orignal", "Seleted" ] + }, + { + "filename": "**/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Pipeline.json", + "words": [ + "specificed" + ] + }, + { + "filename": "**/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/entityTypes/Pipeline.json", + "words": [ + "specificed" + ] } ] } diff --git a/custom-words.txt b/custom-words.txt index b31094a3cba0..588440560795 100644 --- a/custom-words.txt +++ b/custom-words.txt @@ -2260,4 +2260,3 @@ XLSM DOCM multislot Tebibytes -specificed From 8c894f870160598e7c7924bca05936898c939809 Mon Sep 17 00:00:00 2001 From: Jingshu Pan Date: Thu, 12 Aug 2021 13:06:38 +0800 Subject: [PATCH 6/7] fix --- cSpell.json | 12 ------------ .../stable/2018-06-01/entityTypes/Pipeline.json | 4 ++-- .../2019-06-01-preview/entityTypes/Pipeline.json | 4 ++-- 3 files changed, 4 insertions(+), 16 deletions(-) diff --git a/cSpell.json b/cSpell.json index a813da69e69d..9a95be8b2983 100644 --- a/cSpell.json +++ b/cSpell.json @@ -839,18 +839,6 @@ "Orignal", "Seleted" ] - }, - { - "filename": "**/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Pipeline.json", - "words": [ - "specificed" - ] - }, - { - "filename": "**/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/entityTypes/Pipeline.json", - "words": [ - "specificed" - ] } ] } diff --git a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Pipeline.json b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Pipeline.json index 7e07a3f7422b..b673353f25cf 100644 --- a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Pipeline.json +++ b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Pipeline.json @@ -2744,11 +2744,11 @@ }, "partitionUpperBound": { "type": "object", - "description": "The maximum value of column specificed in partitionColumnName that will be used for proceeding range partitioning. Type: string (or Expression with resultType string)." + "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 specificed in partitionColumnName that will be used for proceeding range partitioning. Type: string (or Expression with resultType string)." + "description": "The minimum value of column specified in partitionColumnName that will be used for proceeding range partitioning. Type: string (or Expression with resultType string)." } } }, diff --git a/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/entityTypes/Pipeline.json b/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/entityTypes/Pipeline.json index d538401e5b2e..7ac27f648e79 100644 --- a/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/entityTypes/Pipeline.json +++ b/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/entityTypes/Pipeline.json @@ -2690,11 +2690,11 @@ }, "partitionUpperBound": { "type": "object", - "description": "The maximum value of column specificed in partitionColumnName that will be used for proceeding range partitioning. Type: string (or Expression with resultType string)." + "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 specificed in partitionColumnName that will be used for proceeding range partitioning. Type: string (or Expression with resultType string)." + "description": "The minimum value of column specified in partitionColumnName that will be used for proceeding range partitioning. Type: string (or Expression with resultType string)." } } }, From 4170d691f4b66910417d8601550ee8ea1d7420e3 Mon Sep 17 00:00:00 2001 From: Jingshu Pan Date: Wed, 25 Aug 2021 16:16:05 +0800 Subject: [PATCH 7/7] update --- .../entityTypes/Dataset.json | 31 --------- .../entityTypes/LinkedService.json | 41 ----------- .../entityTypes/Pipeline.json | 69 ------------------- .../entityTypes/Dataset.json | 31 +++++++++ .../entityTypes/LinkedService.json | 41 +++++++++++ .../entityTypes/Pipeline.json | 69 +++++++++++++++++++ 6 files changed, 141 insertions(+), 141 deletions(-) diff --git a/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/entityTypes/Dataset.json b/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/entityTypes/Dataset.json index a839a636a043..b5c0b351bead 100644 --- a/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/entityTypes/Dataset.json +++ b/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/entityTypes/Dataset.json @@ -1706,37 +1706,6 @@ } } }, - "AmazonRdsForOracleTableDataset": { - "x-ms-discriminator-value": "AmazonRdsForOracleTable", - "description": "The AmazonRdsForOracle database dataset.", - "type": "object", - "allOf": [ - { - "$ref": "#/definitions/Dataset" - } - ], - "properties": { - "typeProperties": { - "description": "AmazonRdsForOracle dataset properties.", - "x-ms-client-flatten": true, - "$ref": "#/definitions/AmazonRdsForOracleTableDatasetTypeProperties" - } - } - }, - "AmazonRdsForOracleTableDatasetTypeProperties": { - "description": "AmazonRdsForOracle dataset properties.", - "type": "object", - "properties": { - "schema": { - "type": "object", - "description": "The schema name of the AmazonRdsForOracle database. Type: string (or Expression with resultType string)." - }, - "table": { - "type": "object", - "description": "The table name of the AmazonRdsForOracle database. Type: string (or Expression with resultType string)." - } - } - }, "TeradataTableDataset": { "x-ms-discriminator-value": "TeradataTable", "description": "The Teradata database dataset.", diff --git a/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/entityTypes/LinkedService.json b/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/entityTypes/LinkedService.json index f61411a71058..6aa22cfb0fee 100644 --- a/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/entityTypes/LinkedService.json +++ b/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/entityTypes/LinkedService.json @@ -1088,47 +1088,6 @@ "connectionString" ] }, - "AmazonRdsForOracleLinkedService": { - "x-ms-discriminator-value": "AmazonRdsForOracle", - "description": "AmazonRdsForOracle database.", - "type": "object", - "allOf": [ - { - "$ref": "#/definitions/LinkedService" - } - ], - "properties": { - "typeProperties": { - "description": "AmazonRdsForOracle database linked service properties.", - "x-ms-client-flatten": true, - "$ref": "#/definitions/AmazonRdsForLinkedServiceTypeProperties" - } - }, - "required": [ - "typeProperties" - ] - }, - "AmazonRdsForLinkedServiceTypeProperties": { - "description": "AmazonRdsForOracle database linked service properties.", - "type": "object", - "properties": { - "connectionString": { - "description": "The connection string. Type: string, SecureString or AzureKeyVaultSecretReference.", - "type": "object" - }, - "password": { - "$ref": "../artifacts.json#/definitions/SecretBase", - "description": "The Azure key vault secret reference of password in connection string." - }, - "encryptedCredential": { - "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": [ - "connectionString" - ] - }, "AzureMySqlLinkedService": { "x-ms-discriminator-value": "AzureMySql", "description": "Azure MySQL database linked service.", diff --git a/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/entityTypes/Pipeline.json b/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/entityTypes/Pipeline.json index 7ac27f648e79..e781ade499da 100644 --- a/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/entityTypes/Pipeline.json +++ b/specification/synapse/data-plane/Microsoft.Synapse/preview/2019-06-01-preview/entityTypes/Pipeline.json @@ -2629,75 +2629,6 @@ } } }, - "AmazonRdsForOracleSource": { - "description": "A copy activity AmazonRdsForOracle source.", - "type": "object", - "allOf": [ - { - "$ref": "#/definitions/CopySource" - } - ], - "properties": { - "oracleReaderQuery": { - "type": "object", - "description": "AmazonRdsForOracle reader query. Type: string (or Expression with resultType string)." - }, - "queryTimeout": { - "type": "object", - "description": "Query timeout. Type: string (or Expression with resultType string), pattern: ((\\d+)\\.)?(\\d\\d):(60|([0-5][0-9])):(60|([0-5][0-9]))." - }, - "partitionOption": { - "type": "object", - "description": "The partition mechanism that will be used for AmazonRdsForOracle read in parallel. Type: string (or Expression with resultType string)." - }, - "partitionSettings": { - "description": "The settings that will be leveraged for AmazonRdsForOracle source partitioning.", - "$ref": "#/definitions/AmazonRdsForOraclePartitionSettings" - }, - "additionalColumns": { - "type": "object", - "description": "Specifies the additional columns to be added to source data. Type: array of objects(AdditionalColumns) (or Expression with resultType array of objects)." - } - } - }, - "AmazonRdsForOraclePartitionOption": { - "type": "string", - "enum": [ - "None", - "PhysicalPartitionsOfTable", - "DynamicRange" - ], - "x-ms-enum": { - "name": "AmazonRdsForOraclePartitionOption", - "modelAsString": true - } - }, - "AmazonRdsForOraclePartitionSettings": { - "description": "The settings that will be leveraged for AmazonRdsForOracle source partitioning.", - "type": "object", - "properties": { - "partitionNames": { - "type": "object", - "items": { - "type": "object", - "description": "Type: string (or Expression with resultType string)." - }, - "description": "Names of the physical partitions of AmazonRdsForOracle table. " - }, - "partitionColumnName": { - "type": "object", - "description": "The name of the column in integer type that will be used for proceeding range 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)." - } - } - }, "TeradataSource": { "description": "A copy activity Teradata source.", "type": "object", diff --git a/specification/synapse/data-plane/Microsoft.Synapse/preview/2021-06-01-preview/entityTypes/Dataset.json b/specification/synapse/data-plane/Microsoft.Synapse/preview/2021-06-01-preview/entityTypes/Dataset.json index 3db6a0198094..d1885337287e 100644 --- a/specification/synapse/data-plane/Microsoft.Synapse/preview/2021-06-01-preview/entityTypes/Dataset.json +++ b/specification/synapse/data-plane/Microsoft.Synapse/preview/2021-06-01-preview/entityTypes/Dataset.json @@ -1706,6 +1706,37 @@ } } }, + "AmazonRdsForOracleTableDataset": { + "x-ms-discriminator-value": "AmazonRdsForOracleTable", + "description": "The AmazonRdsForOracle database dataset.", + "type": "object", + "allOf": [ + { + "$ref": "#/definitions/Dataset" + } + ], + "properties": { + "typeProperties": { + "description": "AmazonRdsForOracle dataset properties.", + "x-ms-client-flatten": true, + "$ref": "#/definitions/AmazonRdsForOracleTableDatasetTypeProperties" + } + } + }, + "AmazonRdsForOracleTableDatasetTypeProperties": { + "description": "AmazonRdsForOracle dataset properties.", + "type": "object", + "properties": { + "schema": { + "type": "object", + "description": "The schema name of the AmazonRdsForOracle database. Type: string (or Expression with resultType string)." + }, + "table": { + "type": "object", + "description": "The table name of the AmazonRdsForOracle database. Type: string (or Expression with resultType string)." + } + } + }, "TeradataTableDataset": { "x-ms-discriminator-value": "TeradataTable", "description": "The Teradata database dataset.", diff --git a/specification/synapse/data-plane/Microsoft.Synapse/preview/2021-06-01-preview/entityTypes/LinkedService.json b/specification/synapse/data-plane/Microsoft.Synapse/preview/2021-06-01-preview/entityTypes/LinkedService.json index dc98fc02f422..e451dea78f50 100644 --- a/specification/synapse/data-plane/Microsoft.Synapse/preview/2021-06-01-preview/entityTypes/LinkedService.json +++ b/specification/synapse/data-plane/Microsoft.Synapse/preview/2021-06-01-preview/entityTypes/LinkedService.json @@ -1088,6 +1088,47 @@ "connectionString" ] }, + "AmazonRdsForOracleLinkedService": { + "x-ms-discriminator-value": "AmazonRdsForOracle", + "description": "AmazonRdsForOracle database.", + "type": "object", + "allOf": [ + { + "$ref": "#/definitions/LinkedService" + } + ], + "properties": { + "typeProperties": { + "description": "AmazonRdsForOracle database linked service properties.", + "x-ms-client-flatten": true, + "$ref": "#/definitions/AmazonRdsForLinkedServiceTypeProperties" + } + }, + "required": [ + "typeProperties" + ] + }, + "AmazonRdsForLinkedServiceTypeProperties": { + "description": "AmazonRdsForOracle database linked service properties.", + "type": "object", + "properties": { + "connectionString": { + "description": "The connection string. Type: string, SecureString or AzureKeyVaultSecretReference.", + "type": "object" + }, + "password": { + "$ref": "../artifacts.json#/definitions/SecretBase", + "description": "The Azure key vault secret reference of password in connection string." + }, + "encryptedCredential": { + "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": [ + "connectionString" + ] + }, "AzureMySqlLinkedService": { "x-ms-discriminator-value": "AzureMySql", "description": "Azure MySQL database linked service.", diff --git a/specification/synapse/data-plane/Microsoft.Synapse/preview/2021-06-01-preview/entityTypes/Pipeline.json b/specification/synapse/data-plane/Microsoft.Synapse/preview/2021-06-01-preview/entityTypes/Pipeline.json index 4abc9efc59a9..c0a14a8f2cd9 100644 --- a/specification/synapse/data-plane/Microsoft.Synapse/preview/2021-06-01-preview/entityTypes/Pipeline.json +++ b/specification/synapse/data-plane/Microsoft.Synapse/preview/2021-06-01-preview/entityTypes/Pipeline.json @@ -2566,6 +2566,75 @@ } } }, + "AmazonRdsForOracleSource": { + "description": "A copy activity AmazonRdsForOracle source.", + "type": "object", + "allOf": [ + { + "$ref": "#/definitions/CopySource" + } + ], + "properties": { + "oracleReaderQuery": { + "type": "object", + "description": "AmazonRdsForOracle reader query. Type: string (or Expression with resultType string)." + }, + "queryTimeout": { + "type": "object", + "description": "Query timeout. Type: string (or Expression with resultType string), pattern: ((\\d+)\\.)?(\\d\\d):(60|([0-5][0-9])):(60|([0-5][0-9]))." + }, + "partitionOption": { + "type": "object", + "description": "The partition mechanism that will be used for AmazonRdsForOracle read in parallel. Type: string (or Expression with resultType string)." + }, + "partitionSettings": { + "description": "The settings that will be leveraged for AmazonRdsForOracle source partitioning.", + "$ref": "#/definitions/AmazonRdsForOraclePartitionSettings" + }, + "additionalColumns": { + "type": "object", + "description": "Specifies the additional columns to be added to source data. Type: array of objects(AdditionalColumns) (or Expression with resultType array of objects)." + } + } + }, + "AmazonRdsForOraclePartitionOption": { + "type": "string", + "enum": [ + "None", + "PhysicalPartitionsOfTable", + "DynamicRange" + ], + "x-ms-enum": { + "name": "AmazonRdsForOraclePartitionOption", + "modelAsString": true + } + }, + "AmazonRdsForOraclePartitionSettings": { + "description": "The settings that will be leveraged for AmazonRdsForOracle source partitioning.", + "type": "object", + "properties": { + "partitionNames": { + "type": "object", + "items": { + "type": "object", + "description": "Type: string (or Expression with resultType string)." + }, + "description": "Names of the physical partitions of AmazonRdsForOracle table. " + }, + "partitionColumnName": { + "type": "object", + "description": "The name of the column in integer type that will be used for proceeding range 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)." + } + } + }, "TeradataSource": { "description": "A copy activity Teradata source.", "type": "object",