Revert "Update dataprotocol client" (#500)

* Revert "Fix #494 Connection error when connecting to an Azure SQL Server with no firewall rule (#497)"

This reverts commit edd867b6fc.

* Revert "Update dataprotocol client (#418)"

This reverts commit 7808496416.

src/sqltest/parts/common/optionsDialogHelper.test.ts

@@ -5,12 +5,12 @@
 
 'use strict';
 import * as OptionsDialogHelper from 'sql/base/browser/ui/modal/optionsDialogHelper';
+import { ServiceOptionType } from 'sql/parts/connection/common/connectionManagement';
 import { InputBox } from 'vs/base/browser/ui/inputbox/inputBox';
 import data = require('data');
 import { Builder, $ } from 'vs/base/browser/builder';
 import * as TypeMoq from 'typemoq';
 import * as assert from 'assert';
-import { ServiceOptionType } from 'sql/workbench/api/common/sqlExtHostTypes';
 
 suite('Advanced options helper tests', () => {
 	var possibleInputs: string[];

src/sqltest/parts/connection/connectionProfile.test.ts

@@ -10,7 +10,6 @@ import { ConnectionProfile } from 'sql/parts/connection/common/connectionProfile
 import { IConnectionProfile, IConnectionProfileStore } from 'sql/parts/connection/common/interfaces';
 import data = require('data');
 import * as assert from 'assert';
-import { ConnectionOptionSpecialType } from 'sql/workbench/api/common/sqlExtHostTypes';
 
 suite('SQL ConnectionProfileInfo tests', () => {
 	let msSQLCapabilities: data.DataProtocolServerCapabilities;
@@ -59,7 +58,7 @@ suite('SQL ConnectionProfileInfo tests', () => {
 					defaultValue: undefined,
 					isIdentity: true,
 					isRequired: true,
-					specialValueType: ConnectionOptionSpecialType.serverName,
+					specialValueType: 0,
 					valueType: 0
 				},
 				{
@@ -71,7 +70,7 @@ suite('SQL ConnectionProfileInfo tests', () => {
 					defaultValue: undefined,
 					isIdentity: true,
 					isRequired: true,
-					specialValueType: ConnectionOptionSpecialType.databaseName,
+					specialValueType: 1,
 					valueType: 0
 				},
 				{
@@ -83,7 +82,7 @@ suite('SQL ConnectionProfileInfo tests', () => {
 					defaultValue: undefined,
 					isIdentity: true,
 					isRequired: true,
-					specialValueType: ConnectionOptionSpecialType.userName,
+					specialValueType: 3,
 					valueType: 0
 				},
 				{
@@ -95,7 +94,7 @@ suite('SQL ConnectionProfileInfo tests', () => {
 					defaultValue: undefined,
 					isIdentity: true,
 					isRequired: true,
-					specialValueType: ConnectionOptionSpecialType.authType,
+					specialValueType: 2,
 					valueType: 0
 				},
 				{
@@ -107,7 +106,7 @@ suite('SQL ConnectionProfileInfo tests', () => {
 					defaultValue: undefined,
 					isIdentity: true,
 					isRequired: true,
-					specialValueType: ConnectionOptionSpecialType.password,
+					specialValueType: 4,
 					valueType: 0
 				}
 			]

src/sqltest/parts/connection/connectionStore.test.ts

@@ -19,7 +19,6 @@ import * as data from 'data';
 import { ConnectionProfile } from 'sql/parts/connection/common/connectionProfile';
 import { Emitter } from 'vs/base/common/event';
 import { ConnectionProfileGroup, IConnectionProfileGroup } from 'sql/parts/connection/common/connectionProfileGroup';
-import { ConnectionOptionSpecialType } from 'sql/workbench/api/common/sqlExtHostTypes';
 
 suite('SQL ConnectionStore tests', () => {
 	let defaultNamedProfile: IConnectionProfile;
@@ -109,7 +108,7 @@ suite('SQL ConnectionStore tests', () => {
 					defaultValue: undefined,
 					isIdentity: true,
 					isRequired: true,
-					specialValueType: ConnectionOptionSpecialType.serverName,
+					specialValueType: 0,
 					valueType: 0
 				},
 				{
@@ -121,7 +120,7 @@ suite('SQL ConnectionStore tests', () => {
 					defaultValue: undefined,
 					isIdentity: true,
 					isRequired: true,
-					specialValueType: ConnectionOptionSpecialType.databaseName,
+					specialValueType: 1,
 					valueType: 0
 				},
 				{
@@ -133,7 +132,7 @@ suite('SQL ConnectionStore tests', () => {
 					defaultValue: undefined,
 					isIdentity: true,
 					isRequired: true,
-					specialValueType: ConnectionOptionSpecialType.userName,
+					specialValueType: 3,
 					valueType: 0
 				},
 				{
@@ -145,7 +144,7 @@ suite('SQL ConnectionStore tests', () => {
 					defaultValue: undefined,
 					isIdentity: true,
 					isRequired: true,
-					specialValueType: ConnectionOptionSpecialType.authType,
+					specialValueType: 2,
 					valueType: 0
 				},
 				{
@@ -157,7 +156,7 @@ suite('SQL ConnectionStore tests', () => {
 					defaultValue: undefined,
 					isIdentity: true,
 					isRequired: true,
-					specialValueType: ConnectionOptionSpecialType.password,
+					specialValueType: 4,
 					valueType: 0
 				}
 			]

src/sqltest/parts/connection/objectExplorerService.test.ts

@@ -16,7 +16,6 @@ import { TPromise } from 'vs/base/common/winjs.base';
 import * as data from 'data';
 import * as TypeMoq from 'typemoq';
 import * as assert from 'assert';
-import { ConnectionOptionSpecialType } from 'sql/workbench/api/common/sqlExtHostTypes';
 
 suite('SQL Object Explorer Service tests', () => {
 	var sqlOEProvider: TypeMoq.Mock<ObjectExplorerProviderTestService>;
@@ -136,7 +135,7 @@ suite('SQL Object Explorer Service tests', () => {
 						defaultValue: undefined,
 						isIdentity: true,
 						isRequired: true,
-						specialValueType: ConnectionOptionSpecialType.serverName,
+						specialValueType: 0,
 						valueType: 0
 					},
 					{
@@ -148,7 +147,7 @@ suite('SQL Object Explorer Service tests', () => {
 						defaultValue: undefined,
 						isIdentity: true,
 						isRequired: true,
-						specialValueType: ConnectionOptionSpecialType.databaseName,
+						specialValueType: 1,
 						valueType: 0
 					},
 					{
@@ -160,7 +159,7 @@ suite('SQL Object Explorer Service tests', () => {
 						defaultValue: undefined,
 						isIdentity: true,
 						isRequired: true,
-						specialValueType: ConnectionOptionSpecialType.userName,
+						specialValueType: 3,
 						valueType: 0
 					},
 					{
@@ -172,7 +171,7 @@ suite('SQL Object Explorer Service tests', () => {
 						defaultValue: undefined,
 						isIdentity: true,
 						isRequired: true,
-						specialValueType: ConnectionOptionSpecialType.authType,
+						specialValueType: 2,
 						valueType: 0
 					},
 					{
@@ -184,7 +183,7 @@ suite('SQL Object Explorer Service tests', () => {
 						defaultValue: undefined,
 						isIdentity: true,
 						isRequired: true,
-						specialValueType: ConnectionOptionSpecialType.password,
+						specialValueType: 4,
 						valueType: 0
 					},
 					{

src/sqltest/parts/connection/providerConnectionInfo.test.ts

@@ -10,7 +10,6 @@ import { ProviderConnectionInfo } from 'sql/parts/connection/common/providerConn
 import { IConnectionProfile } from 'sql/parts/connection/common/interfaces';
 import data = require('data');
 import * as assert from 'assert';
-import { ConnectionOptionSpecialType } from 'sql/workbench/api/common/sqlExtHostTypes';
 
 suite('SQL ProviderConnectionInfo tests', () => {
 	let msSQLCapabilities: data.DataProtocolServerCapabilities;
@@ -45,7 +44,7 @@ suite('SQL ProviderConnectionInfo tests', () => {
 					defaultValue: undefined,
 					isIdentity: true,
 					isRequired: true,
-					specialValueType: ConnectionOptionSpecialType.serverName,
+					specialValueType: 0,
 					valueType: 0
 				},
 				{
@@ -57,7 +56,7 @@ suite('SQL ProviderConnectionInfo tests', () => {
 					defaultValue: undefined,
 					isIdentity: true,
 					isRequired: true,
-					specialValueType: ConnectionOptionSpecialType.databaseName,
+					specialValueType: 1,
 					valueType: 0
 				},
 				{
@@ -69,7 +68,7 @@ suite('SQL ProviderConnectionInfo tests', () => {
 					defaultValue: undefined,
 					isIdentity: true,
 					isRequired: true,
-					specialValueType: ConnectionOptionSpecialType.userName,
+					specialValueType: 3,
 					valueType: 0
 				},
 				{
@@ -81,7 +80,7 @@ suite('SQL ProviderConnectionInfo tests', () => {
 					defaultValue: undefined,
 					isIdentity: true,
 					isRequired: true,
-					specialValueType: ConnectionOptionSpecialType.authType,
+					specialValueType: 2,
 					valueType: 0
 				},
 				{
@@ -93,7 +92,7 @@ suite('SQL ProviderConnectionInfo tests', () => {
 					defaultValue: undefined,
 					isIdentity: true,
 					isRequired: true,
-					specialValueType: ConnectionOptionSpecialType.password,
+					specialValueType: 4,
 					valueType: 0
 				},
 				{

src/sqltest/parts/disasterRecovery/restoreViewModel.test.ts

@@ -6,8 +6,8 @@
 'use strict';
 import data = require('data');
 import * as assert from 'assert';
+import { ServiceOptionType } from 'sql/parts/connection/common/connectionManagement';
 import { RestoreViewModel } from 'sql/parts/disasterRecovery/restore/restoreViewModel';
-import { ServiceOptionType } from 'sql/workbench/api/common/sqlExtHostTypes';
 
 suite('Restore Dialog view model tests', () => {
 	let option1String = 'option1';

src/sqltest/stubs/capabilitiesTestService.ts

@@ -9,7 +9,6 @@ import { ConnectionManagementInfo } from 'sql/parts/connection/common/connection
 import { ICapabilitiesService } from 'sql/services/capabilities/capabilitiesService';
 import Event from 'vs/base/common/event';
 import { Action } from 'vs/base/common/actions';
-import { ConnectionOptionSpecialType } from 'sql/workbench/api/common/sqlExtHostTypes';
 
 
 export class CapabilitiesTestService implements ICapabilitiesService {
@@ -34,7 +33,7 @@ export class CapabilitiesTestService implements ICapabilitiesService {
 					defaultValue: undefined,
 					isIdentity: true,
 					isRequired: true,
-					specialValueType: ConnectionOptionSpecialType.serverName,
+					specialValueType: 0,
 					valueType: 0
 				},
 				{
@@ -46,7 +45,7 @@ export class CapabilitiesTestService implements ICapabilitiesService {
 					defaultValue: undefined,
 					isIdentity: true,
 					isRequired: true,
-					specialValueType: ConnectionOptionSpecialType.databaseName,
+					specialValueType: 1,
 					valueType: 0
 				},
 				{
@@ -58,7 +57,7 @@ export class CapabilitiesTestService implements ICapabilitiesService {
 					defaultValue: undefined,
 					isIdentity: true,
 					isRequired: true,
-					specialValueType: ConnectionOptionSpecialType.userName,
+					specialValueType: 3,
 					valueType: 0
 				},
 				{
@@ -70,7 +69,7 @@ export class CapabilitiesTestService implements ICapabilitiesService {
 					defaultValue: undefined,
 					isIdentity: true,
 					isRequired: true,
-					specialValueType: ConnectionOptionSpecialType.authType,
+					specialValueType: 2,
 					valueType: 0
 				},
 				{
@@ -82,7 +81,7 @@ export class CapabilitiesTestService implements ICapabilitiesService {
 					defaultValue: undefined,
 					isIdentity: true,
 					isRequired: true,
-					specialValueType: ConnectionOptionSpecialType.password,
+					specialValueType: 4,
 					valueType: 0
 				}
 			]

src/sqltest/stubs/connectionProviderStub.ts

@@ -3,10 +3,10 @@
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as data from 'data';
+import data = require('data');
 
 export class ConnectionProviderStub implements data.ConnectionProvider {
-	public readonly providerId = 'MSSQL';
+	handle: number = 1;
 
 	connect(connectionUri: string, connectionInfo: data.ConnectionInfo): Thenable<boolean> {
 		return undefined;

src/sqltest/stubs/objectExplorerProviderTestService.ts

@@ -8,8 +8,6 @@ import data = require('data');
 
 export class ObjectExplorerProviderTestService implements data.ObjectExplorerProvider {
 
-	public readonly providerId = 'MSSQL';
-
 	public createNewSession(connInfo: data.ConnectionInfo): Thenable<data.ObjectExplorerCloseSessionResponse> {
 		return Promise.resolve(undefined);
 	}