diff --git a/schemas/2018-06-01/Microsoft.DataFactory.json b/schemas/2018-06-01/Microsoft.DataFactory.json index f6e33d113f..a7b8177c77 100644 --- a/schemas/2018-06-01/Microsoft.DataFactory.json +++ b/schemas/2018-06-01/Microsoft.DataFactory.json @@ -5303,6 +5303,11 @@ "properties": {}, "description": "SQL writer table type. Type: string (or Expression with resultType string)." }, + "sqlWriterUseTableLock": { + "type": "object", + "properties": {}, + "description": "Whether to use table lock during bulk copy. Type: boolean (or Expression with resultType boolean)." + }, "storedProcedureParameters": { "oneOf": [ { @@ -5333,6 +5338,22 @@ "enum": [ "AzureSqlSink" ] + }, + "upsertSettings": { + "oneOf": [ + { + "$ref": "#/definitions/SqlUpsertSettings" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Sql upsert option settings" + }, + "writeBehavior": { + "type": "object", + "properties": {}, + "description": "Write behavior when copying data into Azure SQL. Type: SqlWriteBehaviorEnum (or Expression with resultType SqlWriteBehaviorEnum)" } }, "required": [ @@ -12059,6 +12080,21 @@ "FactoryGitHubConfiguration": { "type": "object", "properties": { + "clientId": { + "type": "string", + "description": "GitHub bring your own app client id." + }, + "clientSecret": { + "oneOf": [ + { + "$ref": "#/definitions/GitHubClientSecret" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Client secret information for factory's bring your own app repository configuration." + }, "hostName": { "type": "string", "description": "GitHub Enterprise host name. For example: https://github.mydomain.com" @@ -12983,6 +13019,20 @@ ], "description": "GetMetadata activity properties." }, + "GitHubClientSecret": { + "type": "object", + "properties": { + "byoaSecretAkvUrl": { + "type": "string", + "description": "Bring your own app client secret AKV URL." + }, + "byoaSecretName": { + "type": "string", + "description": "Bring your own app client secret name in AKV." + } + }, + "description": "Client secret information for factory's bring your own app repository configuration." + }, "GlobalParameterSpecification": { "type": "object", "properties": { @@ -25548,6 +25598,11 @@ "properties": {}, "description": "SQL pre-copy script. Type: string (or Expression with resultType string)." }, + "sqlWriterUseTableLock": { + "type": "object", + "properties": {}, + "description": "Whether to use table lock during bulk copy. Type: boolean (or Expression with resultType boolean)." + }, "tableOption": { "type": "object", "properties": {}, @@ -25558,6 +25613,22 @@ "enum": [ "SqlDWSink" ] + }, + "upsertSettings": { + "oneOf": [ + { + "$ref": "#/definitions/SqlDWUpsertSettings" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Sql DW upsert option settings" + }, + "writeBehavior": { + "type": "object", + "properties": {}, + "description": "Write behavior when copying data into azure SQL DW. Type: SqlDWWriteBehaviorEnum (or Expression with resultType SqlDWWriteBehaviorEnum)" } }, "required": [ @@ -25611,6 +25682,22 @@ ], "description": "A copy activity SQL Data Warehouse source." }, + "SqlDWUpsertSettings": { + "type": "object", + "properties": { + "interimSchemaName": { + "type": "object", + "properties": {}, + "description": "Schema name for interim table. Type: string (or Expression with resultType string)." + }, + "keys": { + "type": "object", + "properties": {}, + "description": "Key column names for unique row identification. Type: array of strings (or Expression with resultType array of strings)." + } + }, + "description": "Sql DW upsert option settings" + }, "SqlMISink": { "type": "object", "properties": { @@ -25629,6 +25716,11 @@ "properties": {}, "description": "SQL writer table type. Type: string (or Expression with resultType string)." }, + "sqlWriterUseTableLock": { + "type": "object", + "properties": {}, + "description": "Whether to use table lock during bulk copy. Type: boolean (or Expression with resultType boolean)." + }, "storedProcedureParameters": { "oneOf": [ { @@ -25659,6 +25751,22 @@ "enum": [ "SqlMISink" ] + }, + "upsertSettings": { + "oneOf": [ + { + "$ref": "#/definitions/SqlUpsertSettings" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Sql upsert option settings" + }, + "writeBehavior": { + "type": "object", + "properties": {}, + "description": "White behavior when copying data into azure SQL MI. Type: SqlWriteBehaviorEnum (or Expression with resultType SqlWriteBehaviorEnum)" } }, "required": [ @@ -25839,6 +25947,11 @@ "properties": {}, "description": "SQL writer table type. Type: string (or Expression with resultType string)." }, + "sqlWriterUseTableLock": { + "type": "object", + "properties": {}, + "description": "Whether to use table lock during bulk copy. Type: boolean (or Expression with resultType boolean)." + }, "storedProcedureParameters": { "oneOf": [ { @@ -25869,6 +25982,22 @@ "enum": [ "SqlServerSink" ] + }, + "upsertSettings": { + "oneOf": [ + { + "$ref": "#/definitions/SqlUpsertSettings" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Sql upsert option settings" + }, + "writeBehavior": { + "type": "object", + "properties": {}, + "description": "Write behavior when copying data into sql server. Type: SqlWriteBehaviorEnum (or Expression with resultType SqlWriteBehaviorEnum)" } }, "required": [ @@ -26058,6 +26187,11 @@ "properties": {}, "description": "SQL writer table type. Type: string (or Expression with resultType string)." }, + "sqlWriterUseTableLock": { + "type": "object", + "properties": {}, + "description": "Whether to use table lock during bulk copy. Type: boolean (or Expression with resultType boolean)." + }, "storedProcedureParameters": { "oneOf": [ { @@ -26088,6 +26222,22 @@ "enum": [ "SqlSink" ] + }, + "upsertSettings": { + "oneOf": [ + { + "$ref": "#/definitions/SqlUpsertSettings" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Sql upsert option settings" + }, + "writeBehavior": { + "type": "object", + "properties": {}, + "description": "Write behavior when copying data into sql. Type: SqlWriteBehaviorEnum (or Expression with resultType SqlWriteBehaviorEnum)" } }, "required": [ @@ -26156,6 +26306,27 @@ ], "description": "A copy activity SQL source." }, + "SqlUpsertSettings": { + "type": "object", + "properties": { + "interimSchemaName": { + "type": "object", + "properties": {}, + "description": "Schema name for interim table. Type: string (or Expression with resultType string)." + }, + "keys": { + "type": "object", + "properties": {}, + "description": "Key column names for unique row identification. Type: array of strings (or Expression with resultType array of strings)." + }, + "useTempDB": { + "type": "object", + "properties": {}, + "description": "Specifies whether to use temp db for upsert interim table. Type: boolean (or Expression with resultType boolean)." + } + }, + "description": "Sql upsert option settings" + }, "SquareLinkedService": { "type": "object", "properties": {