ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-17 02:51:36 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix for issue 3065 (#3067)

Browse Source 
* fix for 3065

* remove the parameter, no need to save connection
This commit is contained in:
Alan Ren
2018-10-31 16:13:09 -07:00
committed by Karl Burtram
parent 1f76c85b1b
commit a06f80bdb1
2 changed files with 22 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/sql/parts/commandLine/common/commandLineService.ts
View File

@@ -17,18 +17,17 @@ import { IObjectExplorerService } from 'sql/parts/objectExplorer/common/objectEx
import { IEditorService } from 'vs/workbench/services/editor/common/editorService'; import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
export class CommandLineService implements ICommandLineProcessing { export class CommandLineService implements ICommandLineProcessing {
private _connectionProfile : ConnectionProfile; private _connectionProfile: ConnectionProfile;
private _showConnectionDialog: boolean; private _showConnectionDialog: boolean;
constructor( constructor(
@IConnectionManagementService private _connectionManagementService : IConnectionManagementService, @IConnectionManagementService private _connectionManagementService: IConnectionManagementService,
@ICapabilitiesService private _capabilitiesService : ICapabilitiesService, @ICapabilitiesService private _capabilitiesService: ICapabilitiesService,
@IEnvironmentService private _environmentService : IEnvironmentService, @IEnvironmentService private _environmentService: IEnvironmentService,
@IQueryEditorService private _queryEditorService : IQueryEditorService, @IQueryEditorService private _queryEditorService: IQueryEditorService,
@IObjectExplorerService private _objectExplorerService : IObjectExplorerService, @IObjectExplorerService private _objectExplorerService: IObjectExplorerService,
@IEditorService private _editorService : IEditorService, @IEditorService private _editorService: IEditorService,
) ) {
{
let profile = null; let profile = null;
if (this._environmentService && this._environmentService.args.server) { if (this._environmentService && this._environmentService.args.server) {
profile = new ConnectionProfile(_capabilitiesService, null); profile = new ConnectionProfile(_capabilitiesService, null);
@@ -38,7 +37,7 @@ export class CommandLineService implements ICommandLineProcessing {
profile.serverName = _environmentService.args.server; profile.serverName = _environmentService.args.server;
profile.databaseName = _environmentService.args.database ? _environmentService.args.database : ''; profile.databaseName = _environmentService.args.database ? _environmentService.args.database : '';
profile.userName = _environmentService.args.user ? _environmentService.args.user : ''; profile.userName = _environmentService.args.user ? _environmentService.args.user : '';
profile.authenticationType = _environmentService.args.integrated ? 'Integrated' : 'SqlLogin'; profile.authenticationType = _environmentService.args.integrated ? 'Integrated' : 'SqlLogin';
profile.connectionName = ''; profile.connectionName = '';
profile.setOptionValue('applicationName', Constants.applicationName); profile.setOptionValue('applicationName', Constants.applicationName);
profile.setOptionValue('databaseDisplayName', profile.databaseName); profile.setOptionValue('databaseDisplayName', profile.databaseName);
@@ -46,14 +45,13 @@ export class CommandLineService implements ICommandLineProcessing {
} }
this._connectionProfile = profile; this._connectionProfile = profile;
const registry = platform.Registry.as<IConnectionProviderRegistry>(ConnectionProviderExtensions.ConnectionProviderContributions); const registry = platform.Registry.as<IConnectionProviderRegistry>(ConnectionProviderExtensions.ConnectionProviderContributions);
let sqlProvider = registry.getProperties( Constants.mssqlProviderName); let sqlProvider = registry.getProperties(Constants.mssqlProviderName);
// We can't connect to object explorer until the MSSQL connection provider is registered // We can't connect to object explorer until the MSSQL connection provider is registered
if (sqlProvider) { if (sqlProvider) {
this.processCommandLine(); this.processCommandLine();
} else { } else {
registry.onNewProvider(e => { registry.onNewProvider(e => {
if (e.id === Constants.mssqlProviderName) if (e.id === Constants.mssqlProviderName) {
{
this.processCommandLine(); this.processCommandLine();
} }
}); });
@@ -64,14 +62,14 @@ export class CommandLineService implements ICommandLineProcessing {
if (!this._connectionProfile && !this._connectionManagementService.hasRegisteredServers()) { if (!this._connectionProfile && !this._connectionManagementService.hasRegisteredServers()) {
// prompt the user for a new connection on startup if no profiles are registered // prompt the user for a new connection on startup if no profiles are registered
this._connectionManagementService.showConnectionDialog(); this._connectionManagementService.showConnectionDialog();
} else if (this._connectionProfile) { } else if (this._connectionProfile) {
this._connectionManagementService.connectIfNotConnected(this._connectionProfile, 'connection') this._connectionManagementService.connectIfNotConnected(this._connectionProfile, 'connection')
.then(result => TaskUtilities.newQuery(this._connectionProfile, .then(result => TaskUtilities.newQuery(this._connectionProfile,
this._connectionManagementService, this._connectionManagementService,
this._queryEditorService, this._queryEditorService,
this._objectExplorerService, this._objectExplorerService,
this._editorService)) this._editorService))
.catch(() => {}); .catch(() => { });
} }
} }
} }

11
src/sql/parts/connection/common/connectionManagementService.ts
View File

@@ -381,12 +381,11 @@ export class ConnectionManagementService extends Disposable implements IConnecti
resolve(this._connectionStatusManager.getOriginalOwnerUri(ownerUri)); resolve(this._connectionStatusManager.getOriginalOwnerUri(ownerUri));
} else { } else {
const options: IConnectionCompletionOptions = { const options: IConnectionCompletionOptions = {
// Should saving the connection be a command line switch? saveTheConnection: false,
saveTheConnection : true, showConnectionDialogOnError: true,
showConnectionDialogOnError : true, showDashboard: purpose === 'dashboard',
showDashboard : purpose === 'dashboard', params: undefined,
params : undefined, showFirewallRuleOnError: true,
showFirewallRuleOnError : true,
}; };
this.connect(connection, ownerUri, options).then(connectionResult => { this.connect(connection, ownerUri, options).then(connectionResult => {
if (connectionResult && connectionResult.connected) { if (connectionResult && connectionResult.connected) {