From 1c588ed167f452d510c3f7d744b8ab5688d0ce89 Mon Sep 17 00:00:00 2001 From: yxi339 Date: Thu, 24 Jun 2021 22:24:51 +0800 Subject: [PATCH 1/3] add table lock and upsert properties --- .../2018-06-01/entityTypes/Pipeline.json | 127 ++++++++++++++++++ 1 file changed, 127 insertions(+) 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 f8dbc3deed9d..ac2c958fa5cf 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 @@ -4141,6 +4141,28 @@ "tableOption": { "type": "object", "description": "The option to handle sink table, such as autoCreate. For now only 'autoCreate' value is supported. Type: string (or Expression with resultType string)." + }, + "sqlWriterUseTableLock": { + "type": "object", + "description": "Whether to use table lock during bulk copy. Type: boolean (or Expression with resultType boolean)." + }, + "writeBehavior": { + "description": "Specify the write behavior when copying data into sql server.", + "type": "string", + "enum": [ + "Insert", + "Upsert", + "StoredProcedure" + ], + "x-ms-enum": { + "name": "SqlWriteBehaviorType", + "modelAsString": true + } + }, + "upsertOption": { + "description": "SQL upsert settings.", + "type": "object", + "$ref": "#/definitions/SqlUpsetOptionSettings" } } }, @@ -4217,6 +4239,28 @@ "tableOption": { "type": "object", "description": "The option to handle sink table, such as autoCreate. For now only 'autoCreate' value is supported. Type: string (or Expression with resultType string)." + }, + "sqlWriterUseTableLock": { + "type": "object", + "description": "Whether to use table lock during bulk copy. Type: boolean (or Expression with resultType boolean)." + }, + "writeBehavior": { + "description": "Specify the write behavior when copying data into azure sql.", + "type": "string", + "enum": [ + "Insert", + "Upsert", + "StoredProcedure" + ], + "x-ms-enum": { + "name": "AzureSqlWriteBehaviorType", + "modelAsString": true + } + }, + "upsertOption": { + "description": "SQL upsert settings.", + "type": "object", + "$ref": "#/definitions/SqlUpsetOptionSettings" } } }, @@ -4255,6 +4299,28 @@ "tableOption": { "type": "object", "description": "The option to handle sink table, such as autoCreate. For now only 'autoCreate' value is supported. Type: string (or Expression with resultType string)." + }, + "sqlWriterUseTableLock": { + "type": "object", + "description": "Whether to use table lock during bulk copy. Type: boolean (or Expression with resultType boolean)." + }, + "writeBehavior": { + "description": "Specify the write behavior when copying data into azure sql managed instance.", + "type": "string", + "enum": [ + "Insert", + "Upsert", + "StoredProcedure" + ], + "x-ms-enum": { + "name": "SqlMIWriteBehaviorType", + "modelAsString": true + } + }, + "upsertOption": { + "description": "SQL upsert settings.", + "type": "object", + "$ref": "#/definitions/SqlUpsetOptionSettings" } } }, @@ -4290,6 +4356,27 @@ "tableOption": { "type": "object", "description": "The option to handle sink table, such as autoCreate. For now only 'autoCreate' value is supported. Type: string (or Expression with resultType string)." + }, + "sqlWriterUseTableLock": { + "type": "object", + "description": "Whether to use table lock during bulk copy. Type: boolean (or Expression with resultType boolean)." + }, + "writeBehavior": { + "description": "Specify the write behavior when copying data into azure sql dw.", + "type": "string", + "enum": [ + "Insert", + "Upsert" + ], + "x-ms-enum": { + "name": "SqlDWWriteBehaviorType", + "modelAsString": true + } + }, + "upsertOption": { + "description": "SQL upsert settings.", + "type": "object", + "$ref": "#/definitions/SqlDWUpsetOptionSettings" } } }, @@ -4364,6 +4451,46 @@ } } }, + "SqlUpsetOptionSettings": { + "description": "Sql upsert option settings", + "type": "object", + "properties": { + "useTempDB": { + "type": "object", + "description": "Specifies whether to use temp db for upsert interim table. Type: boolean (or Expression with resultType boolean)." + }, + "interimSchemaName": { + "type": "object", + "description": "Schema name for interim table. Type: string (or Expression with resultType string)." + }, + "keys": { + "description": "Key column names for unique row identification", + "type": "array", + "items": { + "type": "object", + "description": "Type: string (or Expression with resultType string)." + } + } + } + }, + "SqlDWUpsetOptionSettings": { + "description": "Sql DW upsert option settings", + "type": "object", + "properties": { + "interimSchemaName": { + "type": "object", + "description": "Schema name for interim table. Type: string (or Expression with resultType string)." + }, + "keys": { + "description": "Key column names for unique row identification", + "type": "array", + "items": { + "type": "object", + "description": "Type: string (or Expression with resultType string)." + } + } + } + }, "SnowflakeSink": { "description": "A copy activity snowflake sink.", "type": "object", From bd5a791cedcec24abcee972f742aaf07b007d2ed Mon Sep 17 00:00:00 2001 From: yxi339 Date: Tue, 13 Jul 2021 19:49:39 +0800 Subject: [PATCH 2/3] update naming --- .../2018-06-01/entityTypes/Pipeline.json | 110 +++++++----------- 1 file changed, 44 insertions(+), 66 deletions(-) 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 ac2c958fa5cf..b73330e4f630 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 @@ -4147,22 +4147,12 @@ "description": "Whether to use table lock during bulk copy. Type: boolean (or Expression with resultType boolean)." }, "writeBehavior": { - "description": "Specify the write behavior when copying data into sql server.", - "type": "string", - "enum": [ - "Insert", - "Upsert", - "StoredProcedure" - ], - "x-ms-enum": { - "name": "SqlWriteBehaviorType", - "modelAsString": true - } + "type": "object" }, - "upsertOption": { + "upsertSettings": { "description": "SQL upsert settings.", "type": "object", - "$ref": "#/definitions/SqlUpsetOptionSettings" + "$ref": "#/definitions/SqlUpsertSettings" } } }, @@ -4245,22 +4235,12 @@ "description": "Whether to use table lock during bulk copy. Type: boolean (or Expression with resultType boolean)." }, "writeBehavior": { - "description": "Specify the write behavior when copying data into azure sql.", - "type": "string", - "enum": [ - "Insert", - "Upsert", - "StoredProcedure" - ], - "x-ms-enum": { - "name": "AzureSqlWriteBehaviorType", - "modelAsString": true - } + "type": "object" }, - "upsertOption": { + "upsertSettings": { "description": "SQL upsert settings.", "type": "object", - "$ref": "#/definitions/SqlUpsetOptionSettings" + "$ref": "#/definitions/SqlUpsertSettings" } } }, @@ -4305,22 +4285,12 @@ "description": "Whether to use table lock during bulk copy. Type: boolean (or Expression with resultType boolean)." }, "writeBehavior": { - "description": "Specify the write behavior when copying data into azure sql managed instance.", - "type": "string", - "enum": [ - "Insert", - "Upsert", - "StoredProcedure" - ], - "x-ms-enum": { - "name": "SqlMIWriteBehaviorType", - "modelAsString": true - } + "type": "object" }, - "upsertOption": { + "upsertSettings": { "description": "SQL upsert settings.", "type": "object", - "$ref": "#/definitions/SqlUpsetOptionSettings" + "$ref": "#/definitions/SqlUpsertSettings" } } }, @@ -4362,21 +4332,12 @@ "description": "Whether to use table lock during bulk copy. Type: boolean (or Expression with resultType boolean)." }, "writeBehavior": { - "description": "Specify the write behavior when copying data into azure sql dw.", - "type": "string", - "enum": [ - "Insert", - "Upsert" - ], - "x-ms-enum": { - "name": "SqlDWWriteBehaviorType", - "modelAsString": true - } + "type": "object" }, - "upsertOption": { - "description": "SQL upsert settings.", + "upsertSettings": { + "description": "SQL DW upsert settings.", "type": "object", - "$ref": "#/definitions/SqlDWUpsetOptionSettings" + "$ref": "#/definitions/SqlDWUpsertSettings" } } }, @@ -4451,7 +4412,7 @@ } } }, - "SqlUpsetOptionSettings": { + "SqlUpsertSettings": { "description": "Sql upsert option settings", "type": "object", "properties": { @@ -4464,16 +4425,12 @@ "description": "Schema name for interim table. Type: string (or Expression with resultType string)." }, "keys": { - "description": "Key column names for unique row identification", - "type": "array", - "items": { - "type": "object", - "description": "Type: string (or Expression with resultType string)." - } + "type": "object", + "description": "Key column names for unique row identification. Type: array of strings (or Expression with resultType array of strings)." } } }, - "SqlDWUpsetOptionSettings": { + "SqlDWUpsertSettings": { "description": "Sql DW upsert option settings", "type": "object", "properties": { @@ -4482,15 +4439,36 @@ "description": "Schema name for interim table. Type: string (or Expression with resultType string)." }, "keys": { - "description": "Key column names for unique row identification", - "type": "array", - "items": { - "type": "object", - "description": "Type: string (or Expression with resultType string)." - } + "type": "object", + "description": "Key column names for unique row identification. Type: array of strings (or Expression with resultType array of strings)." } } }, + "SqlWriteBehaviorEnum": { + "description": "Specify the write behavior when copying data into sql.", + "type": "string", + "enum": [ + "Insert", + "Upsert", + "StoredProcedure" + ], + "x-ms-enum": { + "name": "SqlWriteBehaviorEnum", + "modelAsString": true + } + }, + "SqlDWWriteBehaviorEnum": { + "description": "Specify the write behavior when copying data into sql dw.", + "type": "string", + "enum": [ + "Insert", + "Upsert" + ], + "x-ms-enum": { + "name": "SqlDWWriteBehaviorEnum", + "modelAsString": true + } + }, "SnowflakeSink": { "description": "A copy activity snowflake sink.", "type": "object", From 5bb08c6291c03c7a3cbee8bc1ecb75d1a9757922 Mon Sep 17 00:00:00 2001 From: yxi339 Date: Mon, 26 Jul 2021 15:27:34 +0800 Subject: [PATCH 3/3] add description and properties for sqlSink --- .../2018-06-01/entityTypes/Pipeline.json | 25 ++++++++++++++++--- 1 file changed, 21 insertions(+), 4 deletions(-) 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 b73330e4f630..2cca2bcea836 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 @@ -4147,7 +4147,8 @@ "description": "Whether to use table lock during bulk copy. Type: boolean (or Expression with resultType boolean)." }, "writeBehavior": { - "type": "object" + "type": "object", + "description": "Write behavior when copying data into sql. Type: SqlWriteBehaviorEnum (or Expression with resultType SqlWriteBehaviorEnum)" }, "upsertSettings": { "description": "SQL upsert settings.", @@ -4191,6 +4192,19 @@ "tableOption": { "type": "object", "description": "The option to handle sink table, such as autoCreate. For now only 'autoCreate' value is supported. Type: string (or Expression with resultType string)." + }, + "sqlWriterUseTableLock": { + "type": "object", + "description": "Whether to use table lock during bulk copy. Type: boolean (or Expression with resultType boolean)." + }, + "writeBehavior": { + "type": "object", + "description": "Write behavior when copying data into sql server. Type: SqlWriteBehaviorEnum (or Expression with resultType SqlWriteBehaviorEnum)" + }, + "upsertSettings": { + "description": "SQL upsert settings.", + "type": "object", + "$ref": "#/definitions/SqlUpsertSettings" } } }, @@ -4235,7 +4249,8 @@ "description": "Whether to use table lock during bulk copy. Type: boolean (or Expression with resultType boolean)." }, "writeBehavior": { - "type": "object" + "type": "object", + "description": "Write behavior when copying data into Azure SQL. Type: SqlWriteBehaviorEnum (or Expression with resultType SqlWriteBehaviorEnum)" }, "upsertSettings": { "description": "SQL upsert settings.", @@ -4285,7 +4300,8 @@ "description": "Whether to use table lock during bulk copy. Type: boolean (or Expression with resultType boolean)." }, "writeBehavior": { - "type": "object" + "type": "object", + "description": "White behavior when copying data into azure SQL MI. Type: SqlWriteBehaviorEnum (or Expression with resultType SqlWriteBehaviorEnum)" }, "upsertSettings": { "description": "SQL upsert settings.", @@ -4332,7 +4348,8 @@ "description": "Whether to use table lock during bulk copy. Type: boolean (or Expression with resultType boolean)." }, "writeBehavior": { - "type": "object" + "type": "object", + "description": "Write behavior when copying data into azure SQL DW. Type: SqlDWWriteBehaviorEnum (or Expression with resultType SqlDWWriteBehaviorEnum)" }, "upsertSettings": { "description": "SQL DW upsert settings.",