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

Initial VS Code 1.19 source merge (#571)

Browse Source 
* Initial 1.19 xcopy

* Fix yarn build

* Fix numerous build breaks

* Next batch of build break fixes

* More build break fixes

* Runtime breaks

* Additional post merge fixes

* Fix windows setup file

* Fix test failures.

* Update license header blocks to refer to source eula
This commit is contained in:
Karl Burtram
2018-01-28 23:37:17 -08:00
committed by GitHub
parent 9a1ac20710
commit 251ae01c3e
8009 changed files with 93378 additions and 35634 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/sql/parts/connection/common/connectionConfig.ts
View File

@@ -68,9 +68,10 @@ export class ConnectionConfig implements IConnectionConfig {
allGroups = allGroups.concat(userGroups);
}
allGroups = allGroups.map(g => {
if (g.parentId === '' || !g.parentId) {
g.parentId = undefined;
}
// @SQLTODO
// if (g.parentId === '' || !g.parentId) {
// g.parentId = undefined;
// }
return g;
});
return allGroups;

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

@@ -205,7 +205,7 @@ export class ConnectionManagementService implements IConnectionManagementService
if (this._providerCount === 1) {
// show the Registered Server viewlet
let startupConfig = this._workspaceConfigurationService.getConfiguration('startup');
let startupConfig = this._workspaceConfigurationService.getValue('startup');
if (startupConfig) {
let showServerViewlet = <boolean>startupConfig['alwaysShowServersView'];
if (showServerViewlet) {

7
src/sql/parts/connection/common/connectionProfile.ts
View File

@@ -11,6 +11,7 @@ import { ProviderConnectionInfo } from 'sql/parts/connection/common/providerConn
import * as interfaces from 'sql/parts/connection/common/interfaces';
import { equalsIgnoreCase } from 'vs/base/common/strings';
import { generateUuid } from 'vs/base/common/uuid';
import * as objects from 'sql/base/common/objects';
// Concrete implementation of the IConnectionProfile interface
@@ -174,9 +175,9 @@ export class ConnectionProfile extends ProviderConnectionInfo implements interfa
connectionInfo.options = profile.options;
// append group ID and original display name to build unique OE session ID
connectionInfo.options = profile.options;
connectionInfo.options['groupId'] = connectionInfo.groupId;
connectionInfo.options['databaseDisplayName'] = connectionInfo.databaseName;
connectionInfo.options = objects.clone(profile.options);
connectionInfo.options['groupId'] = connectionInfo.groupId;
connectionInfo.options['databaseDisplayName'] = connectionInfo.databaseName;
connectionInfo.groupId = profile.groupId;
connectionInfo.providerName = profile.providerName;

2
src/sql/parts/connection/common/connectionStore.ts
View File

@@ -500,7 +500,7 @@ export class ConnectionStore {
}
private getMaxRecentConnectionsCount(): number {
let config = this._workspaceConfigurationService.getConfiguration(Constants.sqlConfigSectionName);
let config = this._workspaceConfigurationService.getValue(Constants.sqlConfigSectionName);
let maxConnections: number = config[Constants.configMaxRecentConnections];
if (typeof (maxConnections) !== 'number' || maxConnections <= 0) {

4
src/sql/parts/connection/common/interfaces.ts
View File

@@ -22,7 +22,7 @@ export interface IConnectionProfile extends data.ConnectionInfo {
providerName: string;
saveProfile: boolean;
id: string;
};
}
export interface IConnectionProfileStore {
options: {};
@@ -30,5 +30,5 @@ export interface IConnectionProfileStore {
providerName: string;
savePassword: boolean;
id: string;
};
}