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.

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

Fix - DataMigration assigns a single discriminator value to multiple model types #2760

Merged
merged 1 commit into from
Mar 28, 2018
Merged

Fix - DataMigration assigns a single discriminator value to multiple model types #2760

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 5 additions & 5 deletions ...ft.DataMigration/preview/2017-11-15-preview/definitions/ConnectToSourceSqlServerTask.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,16 +38,16 @@
"type": "object",
"description": "Output for the task that validates connection to SQL Server and also validates source server requirements",
"properties": {
"id": {
"type": "string",
"description": "Result identifier",
"readOnly": true
},
"resultType": {
"description": "Type of result - database level or task level",
"type": "string"
}
},
"allOf": [
{
"$ref": "./TasksCommon.json#/definitions/TaskOutput"
}
],
"required": [ "resultType" ],
"discriminator": "resultType"
},
Expand Down
12 changes: 6 additions & 6 deletions ...rosoft.DataMigration/preview/2017-11-15-preview/definitions/ConnectToTargetSqlDbTask.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,11 @@
"type": "object",
"description": "Output for the task that validates connection to SQL DB and target server requirements",
"properties": {
"id": {
"type": "string",
"description": "Result identifier",
"readOnly": true
},
"databases": {
"type": "string",
"description": "Source databases as a map from database name to database id",
Expand All @@ -52,12 +57,7 @@
"description": "Target server brand version",
"readOnly": true
}
},
"allOf": [
{
"$ref": "./TasksCommon.json#/definitions/TaskOutput"
}
]
}
}
}
}
12 changes: 6 additions & 6 deletions .../Microsoft.DataMigration/preview/2017-11-15-preview/definitions/GetUserTablesSqlTask.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,11 @@
"type": "object",
"description": "Output of the task that collects user tables for the given list of databases",
"properties": {
"id": {
"type": "string",
"description": "Result identifier",
"readOnly": true
},
"databasesToTables": {
"type": "string",
"description": "Mapping from database name to list of tables",
Expand All @@ -61,12 +66,7 @@
},
"readOnly": true
}
},
"allOf": [
{
"$ref": "./TasksCommon.json#/definitions/TaskOutput"
}
]
}
},
"DatabaseTable": {
"type": "object",
Expand Down
10 changes: 5 additions & 5 deletions ...osoft.DataMigration/preview/2017-11-15-preview/definitions/MigrateSqlServerSqlDbTask.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,16 +46,16 @@
"type": "object",
"description": "Output for the task that migrates on-prem SQL Server databases to Azure SQL Database",
"properties": {
"id": {
"type": "string",
"description": "Result identifier",
"readOnly": true
},
"resultType": {
"description": "Result type",
"type": "string"
}
},
"allOf": [
{
"$ref": "./TasksCommon.json#/definitions/TaskOutput"
}
],
"required": [ "resultType" ],
"discriminator": "resultType"
},
Expand Down
11 changes: 0 additions & 11 deletions ...e-manager/Microsoft.DataMigration/preview/2017-11-15-preview/definitions/TasksCommon.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,17 +17,6 @@
},
"paths": {},
"definitions": {
"TaskOutput": {
"type": "object",
"description": "Base class for all DMS task outputs",
"properties": {
"id": {
"type": "string",
"description": "Result identifier",
"readOnly": true
}
}
},
"Database": {
"type": "object",
"description": "Information about a single database",
Expand Down
10 changes: 5 additions & 5 deletions ...ft.DataMigration/preview/2018-03-15-preview/definitions/ConnectToSourceSqlServerTask.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,16 +38,16 @@
"type": "object",
"description": "Output for the task that validates connection to SQL Server and also validates source server requirements",
"properties": {
"id": {
"type": "string",
"description": "Result identifier",
"readOnly": true
},
"resultType": {
"description": "Type of result - database level or task level",
"type": "string"
}
},
"allOf": [
{
"$ref": "./TasksCommon.json#/definitions/TaskOutput"
}
],
"required": [ "resultType" ],
"discriminator": "resultType"
},
Expand Down
12 changes: 6 additions & 6 deletions ...rosoft.DataMigration/preview/2018-03-15-preview/definitions/ConnectToTargetSqlDbTask.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,11 @@
"type": "object",
"description": "Output for the task that validates connection to SQL DB and target server requirements",
"properties": {
"id": {
"type": "string",
"description": "Result identifier",
"readOnly": true
},
"databases": {
"type": "string",
"description": "Source databases as a map from database name to database id",
Expand All @@ -52,12 +57,7 @@
"description": "Target server brand version",
"readOnly": true
}
},
"allOf": [
{
"$ref": "./TasksCommon.json#/definitions/TaskOutput"
}
]
}
}
}
}
12 changes: 6 additions & 6 deletions ...rosoft.DataMigration/preview/2018-03-15-preview/definitions/ConnectToTargetSqlMITask.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,11 @@
"type": "object",
"description": "Output for the task that validates connection to Azure SQL Database Managed Instance.",
"properties": {
"id": {
"type": "string",
"description": "Result identifier",
"readOnly": true
},
"targetServerVersion": {
"type": "string",
"description": "Target server version",
Expand All @@ -52,12 +57,7 @@
},
"readOnly": true
}
},
"allOf": [
{
"$ref": "./TasksCommon.json#/definitions/TaskOutput"
}
]
}
}
}
}
12 changes: 6 additions & 6 deletions .../Microsoft.DataMigration/preview/2018-03-15-preview/definitions/GetUserTablesSqlTask.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,11 @@
"type": "object",
"description": "Output of the task that collects user tables for the given list of databases",
"properties": {
"id": {
"type": "string",
"description": "Result identifier",
"readOnly": true
},
"databasesToTables": {
"type": "string",
"description": "Mapping from database name to list of tables",
Expand All @@ -61,12 +66,7 @@
},
"readOnly": true
}
},
"allOf": [
{
"$ref": "./TasksCommon.json#/definitions/TaskOutput"
}
]
}
},
"DatabaseTable": {
"type": "object",
Expand Down
10 changes: 5 additions & 5 deletions ...osoft.DataMigration/preview/2018-03-15-preview/definitions/MigrateSqlServerSqlDbTask.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,16 +46,16 @@
"type": "object",
"description": "Output for the task that migrates on-prem SQL Server databases to Azure SQL Database",
"properties": {
"id": {
"type": "string",
"description": "Result identifier",
"readOnly": true
},
"resultType": {
"description": "Result type",
"type": "string"
}
},
"allOf": [
{
"$ref": "./TasksCommon.json#/definitions/TaskOutput"
}
],
"required": [ "resultType" ],
"discriminator": "resultType"
},
Expand Down
10 changes: 5 additions & 5 deletions ...osoft.DataMigration/preview/2018-03-15-preview/definitions/MigrateSqlServerSqlMITask.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,16 +51,16 @@
"type": "object",
"description": "Output for task that migrates SQL Server databases to Azure SQL Database Managed Instance.",
"properties": {
"id": {
"type": "string",
"description": "Result identifier",
"readOnly": true
},
"resultType": {
"description": "Result type",
"type": "string"
}
},
"allOf": [
{
"$ref": "./TasksCommon.json#/definitions/TaskOutput"
}
],
"required": [ "resultType" ],
"discriminator": "resultType"
},
Expand Down
11 changes: 0 additions & 11 deletions ...e-manager/Microsoft.DataMigration/preview/2018-03-15-preview/definitions/TasksCommon.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,17 +17,6 @@
},
"paths": {},
"definitions": {
"TaskOutput": {
"type": "object",
"description": "Base class for all DMS task outputs",
"properties": {
"id": {
"type": "string",
"description": "Result identifier",
"readOnly": true
}
}
},
"Database": {
"type": "object",
"description": "Information about a single database",
Expand Down
12 changes: 6 additions & 6 deletions ...tion/preview/2018-03-15-preview/definitions/ValidateMigrationInputSqlServerSqlMITask.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,12 +50,12 @@
"ValidateMigrationInputSqlServerSqlMITaskOutput": {
"type": "object",
"description": "Output for task that validates migration input for SQL to Azure SQL Managed Instance migrations",
"allOf": [
{
"$ref": "./TasksCommon.json#/definitions/TaskOutput"
}
],
"properties": {
"id": {
"type": "string",
"description": "Result identifier",
"readOnly": true
},
"name": {
"type": "string",
"description": "Name of database",
Expand Down Expand Up @@ -85,7 +85,7 @@
},
"readOnly": true
},
"backupStorageAccountErrors" : {
"backupStorageAccountErrors": {
"description": "Errors associated with the storage account provided.",
"type": "array",
"items": {
Expand Down