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

Output undefined channel for client (#675)

Browse Source 
* added null output channel to the client

* potential fix the yarn problems
This commit is contained in:
Anthony Dresser
2018-02-12 17:40:26 -08:00
committed by Karl Burtram
parent af9c3d3872
commit 6f21d6e27e
10 changed files with 33 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
extensions/mssql/client/src/controllers/mainController.ts
View File

@@ -11,7 +11,7 @@ import { Serialization } from '../serialize/serialization';
import { AzureResourceProvider } from '../resourceProvider/resourceProvider';
import { CredentialStore } from '../credentialstore/credentialstore';
import { IExtensionConstants, Telemetry, Constants as SharedConstants, SqlToolsServiceClient, VscodeWrapper, Utils, PlatformInformation } from 'extensions-modules';
import { LanguageClient } from 'dataprotocol-client';
import { SqlOpsDataClient } from 'dataprotocol-client';
import * as path from 'path';
/**
@@ -67,17 +67,17 @@ export default class MainController implements vscode.Disposable {
return this._initialized;
}
private createClient(executableFiles: string[]): Promise<LanguageClient> {
private createClient(executableFiles: string[]): Promise<SqlOpsDataClient> {
return PlatformInformation.getCurrent(SqlToolsServiceClient.constants.getRuntimeId, SqlToolsServiceClient.constants.extensionName).then(platformInfo => {
return SqlToolsServiceClient.getInstance(path.join(__dirname, '../config.json')).createClient(this._context, platformInfo.runtimeId, undefined, executableFiles);
});
}
private createCredentialClient(): Promise<LanguageClient> {
private createCredentialClient(): Promise<SqlOpsDataClient> {
return this.createClient(['MicrosoftSqlToolsCredentials.exe', 'MicrosoftSqlToolsCredentials']);
}
private createResourceProviderClient(): Promise<LanguageClient> {
private createResourceProviderClient(): Promise<SqlOpsDataClient> {
return this.createClient(['SqlToolsResourceProviderService.exe', 'SqlToolsResourceProviderService']);
}
@@ -115,7 +115,7 @@ export default class MainController implements vscode.Disposable {
self.createCredentialClient().then(credentialClient => {
self._credentialStore.languageClient = credentialClient;
(<LanguageClient>credentialClient).onReady().then(() => {
credentialClient.onReady().then(() => {
let credentialProvider: data.CredentialProvider = {
handle: 0,
saveCredential(credentialId: string, password: string): Thenable<boolean> {

4
extensions/mssql/client/src/credentialstore/credentialstore.ts
View File

@@ -7,7 +7,7 @@
import * as Contracts from '../models/contracts';
import { ICredentialStore } from './icredentialstore';
import { SqlToolsServiceClient, Utils } from 'extensions-modules';
import { LanguageClient } from 'dataprotocol-client';
import { SqlOpsDataClient } from 'dataprotocol-client';
import * as path from 'path';
/**
@@ -17,7 +17,7 @@ import * as path from 'path';
*/
export class CredentialStore implements ICredentialStore {
public languageClient: LanguageClient;
public languageClient: SqlOpsDataClient;
constructor(private _client?: SqlToolsServiceClient) {
if (!this._client) {

6
extensions/mssql/client/src/resourceprovider/resourceprovider.ts
View File

@@ -6,7 +6,7 @@
import * as Contracts from '../models/contracts';
import { SqlToolsServiceClient } from 'extensions-modules';
import { LanguageClient } from 'dataprotocol-client';
import { SqlOpsDataClient } from 'dataprotocol-client';
import * as data from 'data';
import * as path from 'path';
@@ -18,9 +18,9 @@ import * as path from 'path';
*/
export class AzureResourceProvider implements data.ResourceProvider {
public languageClient: LanguageClient;
public languageClient: SqlOpsDataClient;
constructor(private _client?: SqlToolsServiceClient, langClient?: LanguageClient) {
constructor(private _client?: SqlToolsServiceClient, langClient?: SqlOpsDataClient) {
if (!this._client) {
this._client = SqlToolsServiceClient.getInstance(path.join(__dirname, '../config.json'));
}

4
extensions/mssql/client/src/serialize/serialization.ts
View File

@@ -8,7 +8,7 @@ import * as Contracts from '../models/contracts';
import { ISerialization } from './iserialization';
import { SqlToolsServiceClient } from 'extensions-modules';
import * as data from 'data';
import { LanguageClient } from 'dataprotocol-client';
import { SqlOpsDataClient } from 'dataprotocol-client';
import * as path from 'path';
/**
@@ -16,7 +16,7 @@ import * as path from 'path';
*/
export class Serialization implements ISerialization {
constructor(private _client?: SqlToolsServiceClient, private _languageClient?: LanguageClient) {
constructor(private _client?: SqlToolsServiceClient, private _languageClient?: SqlOpsDataClient) {
if (!this._client) {
this._client = SqlToolsServiceClient.getInstance(path.join(__dirname, '../config.json'));
}