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

Remove database name from schema compare source/target server field (#5327)

Browse Source 
* remove database name from source/target server field
This commit is contained in:
kisantia
2019-05-03 11:20:28 +12:00
committed by GitHub
parent b6e49f2bc0
commit fccd026812
2 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
extensions/dacpac/src/wizard/api/basePage.ts
View File

@@ -4,8 +4,11 @@
*--------------------------------------------------------------------------------------------*/ *--------------------------------------------------------------------------------------------*/
import * as azdata from 'azdata'; import * as azdata from 'azdata';
import * as nls from 'vscode-nls';
import { DacFxDataModel } from './models'; import { DacFxDataModel } from './models';
const localize = nls.loadMessageBundle();
export abstract class BasePage { export abstract class BasePage {
protected readonly wizardPage: azdata.window.WizardPage; protected readonly wizardPage: azdata.window.WizardPage;
@@ -69,11 +72,11 @@ export abstract class BasePage {
let srv = c.options.server; let srv = c.options.server;
if (!db) { if (!db) {
db = '<default>'; db = localize('basePage.defaultDb', '<default>');
} }
if (!usr) { if (!usr) {
usr = 'default'; usr = localize('basePage.defaultUser', 'default');
} }
let finalName = `${srv}, ${db} (${usr})`; let finalName = `${srv}, ${db} (${usr})`;

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

@@ -377,19 +377,14 @@ export class SchemaCompareDialog {
} }
let values = cons.map(c => { let values = cons.map(c => {
let db = c.options.databaseDisplayName;
let usr = c.options.user; let usr = c.options.user;
let srv = c.options.server; let srv = c.options.server;
if (!db) {
db = '<default>';
}
if (!usr) { if (!usr) {
usr = 'default'; usr = localize('schemaCompareDialog.defaultUser', 'default');
} }
let finalName = `${srv}, ${db} (${usr})`; let finalName = `${srv} (${usr})`;
return { return {
connection: c, connection: c,
displayName: finalName, displayName: finalName,