ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-16 10:58:30 -05:00
Code Issues Packages Projects Releases Wiki Activity

Schema Compare open scmp file (#6118)

Browse Source 
* can compare scmp with databases

* show error if can't connect to db

* excludes now work

* fixes after rebase and other small fixes

* Addressing comments

* fixes after rebasing

* fix excludes not always being remembered correctly

* fix switched check

* addressing comments
This commit is contained in:
Kim Santiago
2019-06-25 17:30:07 -07:00
committed by GitHub
parent f01c318c30
commit 144a7f941b
14 changed files with 345 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
extensions/schema-compare/src/dialogs/schemaCompareDialog.ts
View File

@@ -102,7 +102,8 @@ export class SchemaCompareDialog {
serverName: '',
databaseName: '',
ownerUri: '',
packageFilePath: this.sourceTextBox.value
packageFilePath: this.sourceTextBox.value,
connectionDetails: undefined
};
} else {
let ownerUri = await azdata.connection.getUriForConnection((this.sourceServerDropdown.value as ConnectionDropdownValue).connection.connectionId);
@@ -113,7 +114,8 @@ export class SchemaCompareDialog {
serverName: (this.sourceServerDropdown.value as ConnectionDropdownValue).name,
databaseName: (<azdata.CategoryValue>this.sourceDatabaseDropdown.value).name,
ownerUri: ownerUri,
packageFilePath: ''
packageFilePath: '',
connectionDetails: undefined
};
}
@@ -124,7 +126,8 @@ export class SchemaCompareDialog {
serverName: '',
databaseName: '',
ownerUri: '',
packageFilePath: this.targetTextBox.value
packageFilePath: this.targetTextBox.value,
connectionDetails: undefined
};
} else {
let ownerUri = await azdata.connection.getUriForConnection((this.targetServerDropdown.value as ConnectionDropdownValue).connection.connectionId);
@@ -135,7 +138,8 @@ export class SchemaCompareDialog {
serverName: (this.targetServerDropdown.value as ConnectionDropdownValue).name,
databaseName: (<azdata.CategoryValue>this.targetDatabaseDropdown.value).name,
ownerUri: ownerUri,
packageFilePath: ''
packageFilePath: '',
connectionDetails: undefined
};
}
@@ -541,7 +545,7 @@ export class SchemaCompareDialog {
console.error('finalname: ' + finalName + ' endpointname: ' + endpointInfo.serverDisplayName);
}
// use previously selected server or current connection if there is one
if (endpointInfo && endpointInfo.serverName !== null
if (endpointInfo && !isNullOrUndefined(endpointInfo.serverName) && !isNullOrUndefined(endpointInfo.serverDisplayName)
&& c.options.server.toLowerCase() === endpointInfo.serverName.toLowerCase()
&& finalName.toLowerCase() === endpointInfo.serverDisplayName.toLowerCase()) {
idx = count;