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

Update product references from 'sqlops' to 'azdata' (#4259)

Browse Source 
* Update extensions to use azdata

* Switch core code to use azdata
This commit is contained in:
Karl Burtram
2019-03-01 13:59:37 -08:00
committed by GitHub
parent 220685a522
commit 84890eb1b4
371 changed files with 3208 additions and 3184 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/sql/platform/connection/common/connectionConfig.ts
View File

@@ -14,7 +14,7 @@ import { IWorkspaceConfigurationService } from 'vs/workbench/services/configurat
import { ConfigurationTarget } from 'vs/platform/configuration/common/configuration';
import { ConnectionProfile } from './connectionProfile';
import { ICapabilitiesService } from 'sql/platform/capabilities/common/capabilitiesService';
import * as sqlops from 'sqlops';
import * as azdata from 'azdata';
import * as nls from 'vs/nls';
import { generateUuid } from 'vs/base/common/uuid';
@@ -451,7 +451,7 @@ export class ConnectionConfig implements IConnectionConfig {
*/
private getConfiguration(key: string): any {
let configs: any;
configs = this._workspaceConfigurationService.inspect<IConnectionProfileStore[] | IConnectionProfileGroup[] | sqlops.DataProtocolServerCapabilities[]>(key);
configs = this._workspaceConfigurationService.inspect<IConnectionProfileStore[] | IConnectionProfileGroup[] | azdata.DataProtocolServerCapabilities[]>(key);
return configs;
}
@@ -462,7 +462,7 @@ export class ConnectionConfig implements IConnectionConfig {
*/
private writeConfiguration(
key: string,
profiles: IConnectionProfileStore[] | IConnectionProfileGroup[] | sqlops.DataProtocolServerCapabilities[],
profiles: IConnectionProfileStore[] | IConnectionProfileGroup[] | azdata.DataProtocolServerCapabilities[],
target: ConfigurationTarget = ConfigurationTarget.USER): Promise<void> {
return new Promise<void>((resolve, reject) => {
let configValue: IConfigurationValue = {

20
src/sql/platform/connection/common/connectionManagement.ts
View File

@@ -7,7 +7,7 @@
import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
import { Event } from 'vs/base/common/event';
import * as sqlops from 'sqlops';
import * as azdata from 'azdata';
import { IConnectionProfileGroup, ConnectionProfileGroup } from 'sql/platform/connection/common/connectionProfileGroup';
import { ConnectionProfile } from 'sql/platform/connection/common/connectionProfile';
import { IConnectionProfile } from 'sql/platform/connection/common/interfaces';
@@ -76,7 +76,7 @@ export interface IConnectionManagementService {
onConnect: Event<IConnectionParams>;
onDisconnect: Event<IConnectionParams>;
onConnectionChanged: Event<IConnectionParams>;
onLanguageFlavorChanged: Event<sqlops.DidChangeLanguageFlavorParams>;
onLanguageFlavorChanged: Event<azdata.DidChangeLanguageFlavorParams>;
/**
* Opens the connection dialog to create new connection
@@ -119,11 +119,11 @@ export interface IConnectionManagementService {
/**
* Adds the successful connection to MRU and send the connection error back to the connection handler for failed connections
*/
onConnectionComplete(handle: number, connectionInfoSummary: sqlops.ConnectionInfoSummary): void;
onConnectionComplete(handle: number, connectionInfoSummary: azdata.ConnectionInfoSummary): void;
onIntelliSenseCacheComplete(handle: number, connectionUri: string): void;
onConnectionChangedNotification(handle: number, changedConnInfo: sqlops.ChangedConnectionInfo);
onConnectionChangedNotification(handle: number, changedConnInfo: azdata.ChangedConnectionInfo);
getConnectionGroups(providers?: string[]): ConnectionProfileGroup[];
@@ -145,7 +145,7 @@ export interface IConnectionManagementService {
deleteConnectionGroup(group: ConnectionProfileGroup): Promise<boolean>;
getAdvancedProperties(): sqlops.ConnectionOption[];
getAdvancedProperties(): azdata.ConnectionOption[];
getConnectionUri(connectionProfile: IConnectionProfile): string;
@@ -177,12 +177,12 @@ export interface IConnectionManagementService {
addSavedPassword(connectionProfile: IConnectionProfile): Promise<IConnectionProfile>;
listDatabases(connectionUri: string): Thenable<sqlops.ListDatabasesResult>;
listDatabases(connectionUri: string): Thenable<azdata.ListDatabasesResult>;
/**
* Register a connection provider
*/
registerProvider(providerId: string, provider: sqlops.ConnectionProvider): void;
registerProvider(providerId: string, provider: azdata.ConnectionProvider): void;
editGroup(group: ConnectionProfileGroup): Promise<void>;
@@ -261,7 +261,7 @@ export interface IConnectionManagementService {
* @param {string} profileId The id of the connection profile to get the password for
* @returns ServerInfo
*/
getServerInfo(profileId: string): sqlops.ServerInfo;
getServerInfo(profileId: string): azdata.ServerInfo;
/**
* Get the connection string for the provided connection ID
@@ -271,7 +271,7 @@ export interface IConnectionManagementService {
/**
* Serialize connection string with optional provider
*/
buildConnectionInfo(connectionString: string, provider?: string): Thenable<sqlops.ConnectionInfo>;
buildConnectionInfo(connectionString: string, provider?: string): Thenable<azdata.ConnectionInfo>;
providerRegistered(providerId: string): boolean;
/**
@@ -292,7 +292,7 @@ export interface INewConnectionParams {
connectionType: ConnectionType;
input?: IConnectableInput;
runQueryOnCompletion?: RunQueryOnConnectionMode;
querySelection?: sqlops.ISelectionData;
querySelection?: azdata.ISelectionData;
showDashboard?: boolean;
providers?: string[];
}

4
src/sql/platform/connection/common/connectionManagementInfo.ts
View File

@@ -6,7 +6,7 @@
'use strict';
import { ConnectionProfile } from 'sql/platform/connection/common/connectionProfile';
import * as sqlops from 'sqlops';
import * as azdata from 'azdata';
import { StopWatch } from 'vs/base/common/stopwatch';
/**
@@ -64,7 +64,7 @@ export class ConnectionManagementInfo {
/**
* Information about the connected server.
*/
serverInfo: sqlops.ServerInfo;
serverInfo: azdata.ServerInfo;
/**
* Owner uri assigned to the connection

30
src/sql/platform/connection/common/connectionManagementService.ts
View File

@@ -36,7 +36,7 @@ import { ConnectionProviderProperties, IConnectionProviderRegistry, Extensions a
import { IAccountManagementService, AzureResource } from 'sql/platform/accountManagement/common/interfaces';
import { IServerGroupController, IServerGroupDialogCallbacks } from 'sql/platform/serverGroup/common/serverGroupController';
import * as sqlops from 'sqlops';
import * as azdata from 'azdata';
import * as nls from 'vs/nls';
import * as errors from 'vs/base/common/errors';
@@ -62,7 +62,7 @@ export class ConnectionManagementService extends Disposable implements IConnecti
_serviceBrand: any;
private _providers = new Map<string, { onReady: Thenable<sqlops.ConnectionProvider>, properties: ConnectionProviderProperties }>();
private _providers = new Map<string, { onReady: Thenable<azdata.ConnectionProvider>, properties: ConnectionProviderProperties }>();
private _uriToProvider: { [uri: string]: string; } = Object.create(null);
@@ -74,7 +74,7 @@ export class ConnectionManagementService extends Disposable implements IConnecti
private _onDisconnect = new Emitter<IConnectionParams>();
private _onConnectRequestSent = new Emitter<void>();
private _onConnectionChanged = new Emitter<IConnectionParams>();
private _onLanguageFlavorChanged = new Emitter<sqlops.DidChangeLanguageFlavorParams>();
private _onLanguageFlavorChanged = new Emitter<azdata.DidChangeLanguageFlavorParams>();
private _connectionGlobalStatus = new ConnectionGlobalStatus(this._statusBarService);
private _configurationEditService: ConfigurationEditingService;
@@ -123,7 +123,7 @@ export class ConnectionManagementService extends Disposable implements IConnecti
let providerRegistration = (p: { id: string, properties: ConnectionProviderProperties }) => {
let provider = {
onReady: new Deferred<sqlops.ConnectionProvider>(),
onReady: new Deferred<azdata.ConnectionProvider>(),
properties: p.properties
};
this._providers.set(p.id, provider);
@@ -172,25 +172,25 @@ export class ConnectionManagementService extends Disposable implements IConnecti
return this._onConnectRequestSent.event;
}
public get onLanguageFlavorChanged(): Event<sqlops.DidChangeLanguageFlavorParams> {
public get onLanguageFlavorChanged(): Event<azdata.DidChangeLanguageFlavorParams> {
return this._onLanguageFlavorChanged.event;
}
private _providerCount: number = 0;
// Connection Provider Registration
public registerProvider(providerId: string, provider: sqlops.ConnectionProvider): void {
public registerProvider(providerId: string, provider: azdata.ConnectionProvider): void {
if (!this._providers.has(providerId)) {
console.error('Provider', providerId, 'attempted to register but has no metadata');
let providerType = {
onReady: new Deferred<sqlops.ConnectionProvider>(),
onReady: new Deferred<azdata.ConnectionProvider>(),
properties: undefined
};
this._providers.set(providerId, providerType);
}
// we know this is a deferred promise because we made it
(this._providers.get(providerId).onReady as Deferred<sqlops.ConnectionProvider>).resolve(provider);
(this._providers.get(providerId).onReady as Deferred<azdata.ConnectionProvider>).resolve(provider);
}
/**
@@ -652,7 +652,7 @@ export class ConnectionManagementService extends Disposable implements IConnecti
});
}
public getAdvancedProperties(): sqlops.ConnectionOption[] {
public getAdvancedProperties(): azdata.ConnectionOption[] {
let providers = this._capabilitiesService.providers;
if (providers) {
@@ -831,7 +831,7 @@ export class ConnectionManagementService extends Disposable implements IConnecti
});
}
private sendListDatabasesRequest(uri: string): Thenable<sqlops.ListDatabasesResult> {
private sendListDatabasesRequest(uri: string): Thenable<azdata.ListDatabasesResult> {
let providerId: string = this.getProviderIdFromUri(uri);
if (!providerId) {
return Promise.resolve(undefined);
@@ -891,7 +891,7 @@ export class ConnectionManagementService extends Disposable implements IConnecti
});
}
public onConnectionComplete(handle: number, info: sqlops.ConnectionInfoSummary): void {
public onConnectionComplete(handle: number, info: azdata.ConnectionInfoSummary): void {
const self = this;
let connection = this._connectionStatusManager.onConnectionComplete(info);
@@ -919,7 +919,7 @@ export class ConnectionManagementService extends Disposable implements IConnecti
}
}
public onConnectionChangedNotification(handle: number, changedConnInfo: sqlops.ChangedConnectionInfo): void {
public onConnectionChangedNotification(handle: number, changedConnInfo: azdata.ChangedConnectionInfo): void {
let profile: IConnectionProfile = this._connectionStatusManager.onConnectionChanged(changedConnInfo);
this._notifyConnectionChanged(profile, changedConnInfo.connectionUri);
}
@@ -1188,7 +1188,7 @@ export class ConnectionManagementService extends Disposable implements IConnecti
return this._connectionStatusManager.isConnected(fileUri) ? this._connectionStatusManager.findConnection(fileUri) : undefined;
}
public listDatabases(connectionUri: string): Thenable<sqlops.ListDatabasesResult> {
public listDatabases(connectionUri: string): Thenable<azdata.ListDatabasesResult> {
const self = this;
if (self.isConnected(connectionUri)) {
return self.sendListDatabasesRequest(connectionUri);
@@ -1366,7 +1366,7 @@ export class ConnectionManagementService extends Disposable implements IConnecti
return credentials;
}
public getServerInfo(profileId: string): sqlops.ServerInfo {
public getServerInfo(profileId: string): azdata.ServerInfo {
let profile = this._connectionStatusManager.findConnectionByProfileId(profileId);
if (!profile) {
return undefined;
@@ -1411,7 +1411,7 @@ export class ConnectionManagementService extends Disposable implements IConnecti
* Serialize connection with options provider
* TODO this could be a map reduce operation
*/
public buildConnectionInfo(connectionString: string, provider: string): Thenable<sqlops.ConnectionInfo> {
public buildConnectionInfo(connectionString: string, provider: string): Thenable<azdata.ConnectionInfo> {
let connectionProvider = this._providers.get(provider);
if (connectionProvider) {
return connectionProvider.onReady.then(e => {

8
src/sql/platform/connection/common/connectionProfile.ts
View File

@@ -6,7 +6,7 @@
'use strict';
import { ConnectionProfileGroup } from './connectionProfileGroup';
import * as sqlops from 'sqlops';
import * as azdata from 'azdata';
import { ProviderConnectionInfo } from 'sql/platform/connection/common/providerConnectionInfo';
import * as interfaces from 'sql/platform/connection/common/interfaces';
import { equalsIgnoreCase } from 'vs/base/common/strings';
@@ -33,7 +33,7 @@ export class ConnectionProfile extends ProviderConnectionInfo implements interfa
public constructor(
capabilitiesService: ICapabilitiesService,
model: string | sqlops.IConnectionProfile
model: string | azdata.IConnectionProfile
) {
super(capabilitiesService, model);
if (model && !isString(model)) {
@@ -175,13 +175,13 @@ export class ConnectionProfile extends ProviderConnectionInfo implements interfa
return result;
}
public toConnectionInfo(): sqlops.ConnectionInfo {
public toConnectionInfo(): azdata.ConnectionInfo {
return {
options: this.options
};
}
public static fromIConnectionProfile(capabilitiesService: ICapabilitiesService, profile: sqlops.IConnectionProfile) {
public static fromIConnectionProfile(capabilitiesService: ICapabilitiesService, profile: azdata.IConnectionProfile) {
if (profile) {
if (profile instanceof ConnectionProfile) {
return profile;

10
src/sql/platform/connection/common/connectionStatusManager.ts
View File

@@ -9,13 +9,13 @@ import { ICapabilitiesService } from 'sql/platform/capabilities/common/capabilit
import { ConnectionProfile } from 'sql/platform/connection/common/connectionProfile';
import { IConnectionProfile } from './interfaces';
import * as Utils from './utils';
import * as sqlops from 'sqlops';
import * as azdata from 'azdata';
import { StopWatch } from 'vs/base/common/stopwatch';
export class ConnectionStatusManager {
private _connections: { [id: string]: ConnectionManagementInfo };
private _providerCapabilitiesMap: { [providerName: string]: sqlops.DataProtocolServerCapabilities };
private _providerCapabilitiesMap: { [providerName: string]: azdata.DataProtocolServerCapabilities };
constructor( @ICapabilitiesService private _capabilitiesService: ICapabilitiesService) {
this._connections = {};
@@ -110,7 +110,7 @@ export class ConnectionStatusManager {
return newId;
}
public onConnectionComplete(summary: sqlops.ConnectionInfoSummary): ConnectionManagementInfo {
public onConnectionComplete(summary: azdata.ConnectionInfoSummary): ConnectionManagementInfo {
let connection = this._connections[summary.ownerUri];
connection.serviceTimer.stop();
connection.connecting = false;
@@ -123,7 +123,7 @@ export class ConnectionStatusManager {
* Updates database name after connection is complete
* @param summary connection summary
*/
public updateDatabaseName(summary: sqlops.ConnectionInfoSummary): void {
public updateDatabaseName(summary: azdata.ConnectionInfoSummary): void {
let connection = this._connections[summary.ownerUri];
//Check if the existing connection database name is different the one in the summary
@@ -158,7 +158,7 @@ export class ConnectionStatusManager {
return ownerUriToReturn;
}
public onConnectionChanged(changedConnInfo: sqlops.ChangedConnectionInfo): IConnectionProfile {
public onConnectionChanged(changedConnInfo: azdata.ChangedConnectionInfo): IConnectionProfile {
let connection = this._connections[changedConnInfo.connectionUri];
if (connection && connection.connectionProfile) {
connection.connectionProfile.serverName = changedConnInfo.connection.serverName;

4
src/sql/platform/connection/common/connectionStore.ts
View File

@@ -209,7 +209,7 @@ export class ConnectionStore {
* Gets the list of recently used connections. These will not include the password - a separate call to
* {addSavedPassword} is needed to fill that before connecting
*
* @returns {sqlops.ConnectionInfo} the array of connections, empty if none are found
* @returns {azdata.ConnectionInfo} the array of connections, empty if none are found
*/
public getRecentlyUsedConnections(providers?: string[]): ConnectionProfile[] {
let configValues: IConnectionProfile[] = this._memento[Constants.recentConnections];
@@ -249,7 +249,7 @@ export class ConnectionStore {
* Gets the list of active connections. These will not include the password - a separate call to
* {addSavedPassword} is needed to fill that before connecting
*
* @returns {sqlops.ConnectionInfo} the array of connections, empty if none are found
* @returns {azdata.ConnectionInfo} the array of connections, empty if none are found
*/
public getActiveConnections(): ConnectionProfile[] {
let configValues: IConnectionProfile[] = this._memento[Constants.activeConnections];

2
src/sql/platform/connection/common/constants.ts
View File

@@ -24,7 +24,7 @@ export const mssqlProviderName = 'MSSQL';
export const anyProviderName = '*';
export const connectionProviderContextKey = 'connectionProvider';
export const applicationName = 'sqlops';
export const applicationName = 'azdata';
export const defaultEngine = 'defaultEngine';

2
src/sql/platform/connection/common/iconnectionConfig.ts
View File

@@ -8,7 +8,7 @@
import { IConnectionProfile } from './interfaces';
import { IConnectionProfileGroup, ConnectionProfileGroup } from './connectionProfileGroup';
import { ConnectionProfile } from './connectionProfile';
import * as sqlops from 'sqlops';
import * as azdata from 'azdata';
/**
* Interface for a configuration file that stores connection profiles.

6
src/sql/platform/connection/common/interfaces.ts
View File

@@ -4,11 +4,11 @@
*--------------------------------------------------------------------------------------------*/
'use strict';
import * as sqlops from 'sqlops';
import * as azdata from 'azdata';
export interface IConnectionProfile extends sqlops.IConnectionProfile {
export interface IConnectionProfile extends azdata.IConnectionProfile {
getOptionsKey(): string;
matches(profile: sqlops.IConnectionProfile): boolean;
matches(profile: azdata.IConnectionProfile): boolean;
}
export interface IConnectionProfileStore {

10
src/sql/platform/connection/common/providerConnectionInfo.ts
View File

@@ -8,7 +8,7 @@
import { Disposable } from 'vs/base/common/lifecycle';
import { isString } from 'vs/base/common/types';
import * as sqlops from 'sqlops';
import * as azdata from 'azdata';
import { ConnectionOptionSpecialType, ServiceOptionType } from 'sql/workbench/api/common/sqlExtHostTypes';
import * as Constants from 'sql/platform/connection/common/constants';
import { ICapabilitiesService } from 'sql/platform/capabilities/common/capabilitiesService';
@@ -16,7 +16,7 @@ import { ConnectionProviderProperties } from 'sql/workbench/parts/connection/com
type SettableProperty = 'serverName' | 'authenticationType' | 'databaseName' | 'password' | 'connectionName' | 'userName';
export class ProviderConnectionInfo extends Disposable implements sqlops.ConnectionInfo {
export class ProviderConnectionInfo extends Disposable implements azdata.ConnectionInfo {
options: { [name: string]: any } = {};
@@ -27,7 +27,7 @@ export class ProviderConnectionInfo extends Disposable implements sqlops.Connect
public constructor(
protected capabilitiesService: ICapabilitiesService,
model: string | sqlops.IConnectionProfile
model: string | azdata.IConnectionProfile
) {
super();
// we can't really do a whole lot if we don't have a provider
@@ -59,7 +59,7 @@ export class ProviderConnectionInfo extends Disposable implements sqlops.Connect
*
* This handles the case where someone hasn't passed in a valid property bag, but doesn't cause errors when
*/
private updateSpecialValueType(typeName: SettableProperty, model: sqlops.IConnectionProfile): void {
private updateSpecialValueType(typeName: SettableProperty, model: azdata.IConnectionProfile): void {
if (!this[typeName]) {
this[typeName] = model[typeName];
}
@@ -283,7 +283,7 @@ export class ProviderConnectionInfo extends Disposable implements sqlops.Connect
return displayName;
}
public getProviderOptions(): sqlops.ConnectionOption[] {
public getProviderOptions(): azdata.ConnectionOption[] {
return this._serverCapabilities.connectionOptions;
}