ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-01-20 17:22:51 -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

20
src/sql/platform/accountManagement/browser/accountPicker.ts
View File

@@ -19,7 +19,7 @@ import { Disposable, IDisposable } from 'vs/base/common/lifecycle';
import { ActionBar } from 'vs/base/browser/ui/actionbar/actionbar';
import { IThemeService, ITheme } from 'vs/platform/theme/common/themeService';
import * as sqlops from 'sqlops';
import * as azdata from 'azdata';
import { DropdownList } from 'sql/base/browser/ui/dropdownList/dropdownList';
import { attachDropdownStyler } from 'sql/platform/theme/common/styler';
import { AddAccountAction, RefreshAccountAction } from 'sql/parts/accountManagement/common/accountActions';
@@ -29,7 +29,7 @@ import { AccountPickerViewModel } from 'sql/platform/accountManagement/common/ac
export class AccountPicker extends Disposable {
public static ACCOUNTPICKERLIST_HEIGHT = 47;
public viewModel: AccountPickerViewModel;
private _accountList: List<sqlops.Account>;
private _accountList: List<azdata.Account>;
private _rootElement: HTMLElement;
private _refreshContainer: HTMLElement;
private _listContainer: HTMLElement;
@@ -46,8 +46,8 @@ export class AccountPicker extends Disposable {
private _addAccountStartEmitter: Emitter<void>;
public get addAccountStartEvent(): Event<void> { return this._addAccountStartEmitter.event; }
private _onAccountSelectionChangeEvent: Emitter<sqlops.Account>;
public get onAccountSelectionChangeEvent(): Event<sqlops.Account> { return this._onAccountSelectionChangeEvent.event; }
private _onAccountSelectionChangeEvent: Emitter<azdata.Account>;
public get onAccountSelectionChangeEvent(): Event<azdata.Account> { return this._onAccountSelectionChangeEvent.event; }
constructor(
private _providerId: string,
@@ -61,7 +61,7 @@ export class AccountPicker extends Disposable {
this._addAccountCompleteEmitter = new Emitter<void>();
this._addAccountErrorEmitter = new Emitter<string>();
this._addAccountStartEmitter = new Emitter<void>();
this._onAccountSelectionChangeEvent = new Emitter<sqlops.Account>();
this._onAccountSelectionChangeEvent = new Emitter<azdata.Account>();
// Create the view model, wire up the events, and initialize with baseline data
this.viewModel = this._instantiationService.createInstance(AccountPickerViewModel, this._providerId);
@@ -89,7 +89,7 @@ export class AccountPicker extends Disposable {
let delegate = new AccountListDelegate(AccountPicker.ACCOUNTPICKERLIST_HEIGHT);
let accountRenderer = new AccountPickerListRenderer();
this._listContainer = DOM.$('div.account-list-container');
this._accountList = new List<sqlops.Account>(this._listContainer, delegate, [accountRenderer]);
this._accountList = new List<azdata.Account>(this._listContainer, delegate, [accountRenderer]);
this._register(attachListStyler(this._accountList, this._themeService));
this._rootElement = DOM.$('div.account-picker-container');
@@ -108,7 +108,7 @@ export class AccountPicker extends Disposable {
this._dropdown = this._register(new DropdownList(this._rootElement, option, this._listContainer, this._accountList, this._themeService, addAccountAction));
this._register(attachDropdownStyler(this._dropdown, this._themeService));
this._register(this._accountList.onSelectionChange((e: IListEvent<sqlops.Account>) => {
this._register(this._accountList.onSelectionChange((e: IListEvent<azdata.Account>) => {
if (e.elements.length === 1) {
this._dropdown.renderLabel();
this.onAccountSelectionChange(e.elements[0]);
@@ -134,7 +134,7 @@ export class AccountPicker extends Disposable {
// Load the initial contents of the view model
this.viewModel.initialize()
.then((accounts: sqlops.Account[]) => {
.then((accounts: azdata.Account[]) => {
this.updateAccountList(accounts);
});
}
@@ -147,7 +147,7 @@ export class AccountPicker extends Disposable {
}
// PRIVATE HELPERS /////////////////////////////////////////////////////
private onAccountSelectionChange(account: sqlops.Account) {
private onAccountSelectionChange(account: azdata.Account) {
this.viewModel.selectedAccount = account;
if (account && account.isStale) {
this._refreshAccountAction.account = account;
@@ -194,7 +194,7 @@ export class AccountPicker extends Disposable {
return null;
}
private updateAccountList(accounts: sqlops.Account[]): void {
private updateAccountList(accounts: azdata.Account[]): void {
// keep the selection to the current one
let selectedElements = this._accountList.getSelectedElements();

10
src/sql/platform/accountManagement/browser/accountPickerService.ts
View File

@@ -6,7 +6,7 @@
'use strict';
import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
import { Event, Emitter } from 'vs/base/common/event';
import * as sqlops from 'sqlops';
import * as azdata from 'azdata';
import { IAccountPickerService } from 'sql/platform/accountManagement/common/accountPicker';
import { AccountPicker } from 'sql/platform/accountManagement/browser/accountPicker';
@@ -26,8 +26,8 @@ export class AccountPickerService implements IAccountPickerService {
private _addAccountStartEmitter: Emitter<void>;
public get addAccountStartEvent(): Event<void> { return this._addAccountStartEmitter.event; }
private _onAccountSelectionChangeEvent: Emitter<sqlops.Account>;
public get onAccountSelectionChangeEvent(): Event<sqlops.Account> { return this._onAccountSelectionChangeEvent.event; }
private _onAccountSelectionChangeEvent: Emitter<azdata.Account>;
public get onAccountSelectionChangeEvent(): Event<azdata.Account> { return this._onAccountSelectionChangeEvent.event; }
constructor(
@IInstantiationService private _instantiationService: IInstantiationService
@@ -36,13 +36,13 @@ export class AccountPickerService implements IAccountPickerService {
this._addAccountCompleteEmitter = new Emitter<void>();
this._addAccountErrorEmitter = new Emitter<string>();
this._addAccountStartEmitter = new Emitter<void>();
this._onAccountSelectionChangeEvent = new Emitter<sqlops.Account>();
this._onAccountSelectionChangeEvent = new Emitter<azdata.Account>();
}
/**
* Get selected account
*/
public get selectedAccount(): sqlops.Account {
public get selectedAccount(): azdata.Account {
return this._accountPicker.viewModel.selectedAccount;
}

6
src/sql/platform/accountManagement/common/accountPicker.ts
View File

@@ -8,7 +8,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';
export const IAccountPickerService = createDecorator<IAccountPickerService>('AccountPickerService');
export interface IAccountPickerService {
@@ -17,6 +17,6 @@ export interface IAccountPickerService {
addAccountCompleteEvent: Event<void>;
addAccountErrorEvent: Event<string>;
addAccountStartEvent: Event<void>;
onAccountSelectionChangeEvent: Event<sqlops.Account>;
selectedAccount: sqlops.Account;
onAccountSelectionChangeEvent: Event<azdata.Account>;
selectedAccount: azdata.Account;
}

6
src/sql/platform/accountManagement/common/accountPickerViewModel.ts
View File

@@ -4,7 +4,7 @@
*--------------------------------------------------------------------------------------------*/
'use strict';
import * as sqlops from 'sqlops';
import * as azdata from 'azdata';
import { Event, Emitter } from 'vs/base/common/event';
import { IAccountManagementService } from 'sql/platform/accountManagement/common/interfaces';
@@ -18,7 +18,7 @@ export class AccountPickerViewModel {
private _updateAccountListEmitter: Emitter<UpdateAccountListEventParams>;
public get updateAccountListEvent(): Event<UpdateAccountListEventParams> { return this._updateAccountListEmitter.event; }
public selectedAccount: sqlops.Account;
public selectedAccount: azdata.Account;
constructor(
private _providerId: string,
@@ -38,7 +38,7 @@ export class AccountPickerViewModel {
* Loads an initial list of accounts from the account management service
* @return {Thenable<Account[]>} Promise to return the list of accounts
*/
public initialize(): Thenable<sqlops.Account[]> {
public initialize(): Thenable<azdata.Account[]> {
// Load a baseline of the accounts for the provider
return this._accountManagementService.getAccountsForProvider(this._providerId)
.then(null, () => {

28
src/sql/platform/accountManagement/common/accountStore.ts
View File

@@ -5,7 +5,7 @@
'use strict';
import * as sqlops from 'sqlops';
import * as azdata from 'azdata';
import { AccountAdditionResult } from 'sql/platform/accountManagement/common/eventTypes';
import { IAccountStore } from 'sql/platform/accountManagement/common/interfaces';
@@ -19,7 +19,7 @@ export default class AccountStore implements IAccountStore {
constructor(private _memento: object) { }
// PUBLIC METHODS //////////////////////////////////////////////////////
public addOrUpdate(newAccount: sqlops.Account): Thenable<AccountAdditionResult> {
public addOrUpdate(newAccount: azdata.Account): Thenable<AccountAdditionResult> {
let self = this;
return this.doOperation(() => {
@@ -36,7 +36,7 @@ export default class AccountStore implements IAccountStore {
});
}
public getAccountsByProvider(providerId: string): Thenable<sqlops.Account[]> {
public getAccountsByProvider(providerId: string): Thenable<azdata.Account[]> {
let self = this;
return this.doOperation(() => {
@@ -45,7 +45,7 @@ export default class AccountStore implements IAccountStore {
});
}
public getAllAccounts(): Thenable<sqlops.Account[]> {
public getAllAccounts(): Thenable<azdata.Account[]> {
let self = this;
return this.doOperation(() => {
@@ -53,7 +53,7 @@ export default class AccountStore implements IAccountStore {
});
}
public remove(key: sqlops.AccountKey): Thenable<boolean> {
public remove(key: azdata.AccountKey): Thenable<boolean> {
let self = this;
return this.doOperation(() => {
@@ -64,7 +64,7 @@ export default class AccountStore implements IAccountStore {
});
}
public update(key: sqlops.AccountKey, updateOperation: (account: sqlops.Account) => void): Thenable<boolean> {
public update(key: azdata.AccountKey, updateOperation: (account: azdata.Account) => void): Thenable<boolean> {
let self = this;
return this.doOperation(() => {
@@ -76,12 +76,12 @@ export default class AccountStore implements IAccountStore {
}
// PRIVATE METHODS /////////////////////////////////////////////////////
private static findAccountByKey(key1: sqlops.AccountKey, key2: sqlops.AccountKey): boolean {
private static findAccountByKey(key1: azdata.AccountKey, key2: azdata.AccountKey): boolean {
// Provider ID and Account ID must match
return key1.providerId === key2.providerId && key1.accountId === key2.accountId;
}
private static mergeAccounts(source: sqlops.Account, target: sqlops.Account): void {
private static mergeAccounts(source: azdata.Account, target: azdata.Account): void {
// Take any display info changes
target.displayInfo = source.displayInfo;
@@ -109,7 +109,7 @@ export default class AccountStore implements IAccountStore {
return <Promise<T>>this._activeOperation;
}
private addToAccountList(accounts: sqlops.Account[], accountToAdd: sqlops.Account): AccountListOperationResult {
private addToAccountList(accounts: azdata.Account[], accountToAdd: azdata.Account): AccountListOperationResult {
// Check if the entry already exists
let match = accounts.findIndex(account => AccountStore.findAccountByKey(account.key, accountToAdd.key));
if (match >= 0) {
@@ -134,7 +134,7 @@ export default class AccountStore implements IAccountStore {
};
}
private removeFromAccountList(accounts: sqlops.Account[], accountToRemove: sqlops.AccountKey): AccountListOperationResult {
private removeFromAccountList(accounts: azdata.Account[], accountToRemove: azdata.AccountKey): AccountListOperationResult {
// Check if the entry exists
let match = accounts.findIndex(account => AccountStore.findAccountByKey(account.key, accountToRemove));
if (match >= 0) {
@@ -151,7 +151,7 @@ export default class AccountStore implements IAccountStore {
};
}
private updateAccountList(accounts: sqlops.Account[], accountToUpdate: sqlops.AccountKey, updateOperation: (account: sqlops.Account) => void): AccountListOperationResult {
private updateAccountList(accounts: azdata.Account[], accountToUpdate: azdata.AccountKey, updateOperation: (account: azdata.Account) => void): AccountListOperationResult {
// Check if the entry exists
let match = accounts.findIndex(account => AccountStore.findAccountByKey(account.key, accountToUpdate));
if (match < 0) {
@@ -178,7 +178,7 @@ export default class AccountStore implements IAccountStore {
}
// MEMENTO IO METHODS //////////////////////////////////////////////////
private readFromMemento(): Thenable<sqlops.Account[]> {
private readFromMemento(): Thenable<azdata.Account[]> {
// Initialize the account list if it isn't already
let accounts = this._memento[AccountStore.MEMENTO_KEY];
if (!accounts) {
@@ -191,7 +191,7 @@ export default class AccountStore implements IAccountStore {
return Promise.resolve(accounts);
}
private writeToMemento(accounts: sqlops.Account[]): Thenable<void> {
private writeToMemento(accounts: azdata.Account[]): Thenable<void> {
// Store a shallow copy of the account list to disconnect the memento list from the active list
this._memento[AccountStore.MEMENTO_KEY] = JSON.parse(JSON.stringify(accounts));
return Promise.resolve();
@@ -200,5 +200,5 @@ export default class AccountStore implements IAccountStore {
interface AccountListOperationResult extends AccountAdditionResult {
accountRemoved: boolean;
updatedAccounts: sqlops.Account[];
updatedAccounts: azdata.Account[];
}

10
src/sql/platform/accountManagement/common/eventTypes.ts
View File

@@ -5,7 +5,7 @@
'use strict';
import * as sqlops from 'sqlops';
import * as azdata from 'azdata';
/**
* Result from calling add/update on the account store
@@ -24,7 +24,7 @@ export interface AccountAdditionResult {
/**
* The account that was added/updated (with any updates applied)
*/
changedAccount: sqlops.Account;
changedAccount: azdata.Account;
}
/**
@@ -34,12 +34,12 @@ export interface AccountProviderAddedEventParams {
/**
* The provider that was registered
*/
addedProvider: sqlops.AccountProviderMetadata;
addedProvider: azdata.AccountProviderMetadata;
/**
* The accounts that were rehydrated with the provider
*/
initialAccounts: sqlops.Account[];
initialAccounts: azdata.Account[];
}
/**
@@ -54,5 +54,5 @@ export interface UpdateAccountListEventParams {
/**
* Updated list of accounts, sorted appropriately
*/
accountList: sqlops.Account[];
accountList: azdata.Account[];
}

32
src/sql/platform/accountManagement/common/interfaces.ts
View File

@@ -5,7 +5,7 @@
'use strict';
import * as sqlops from 'sqlops';
import * as azdata from 'azdata';
import { Event } from 'vs/base/common/event';
import { AccountAdditionResult, AccountProviderAddedEventParams, UpdateAccountListEventParams } from 'sql/platform/accountManagement/common/eventTypes';
import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
@@ -18,13 +18,13 @@ export interface IAccountManagementService {
_serviceBrand: any;
// ACCOUNT MANAGEMENT METHODS //////////////////////////////////////////
accountUpdated(account: sqlops.Account): Thenable<void>;
accountUpdated(account: azdata.Account): Thenable<void>;
addAccount(providerId: string): Thenable<void>;
getAccountProviderMetadata(): Thenable<sqlops.AccountProviderMetadata[]>;
getAccountsForProvider(providerId: string): Thenable<sqlops.Account[]>;
getSecurityToken(account: sqlops.Account, resource: sqlops.AzureResource): Thenable<{}>;
removeAccount(accountKey: sqlops.AccountKey): Thenable<boolean>;
refreshAccount(account: sqlops.Account): Thenable<sqlops.Account>;
getAccountProviderMetadata(): Thenable<azdata.AccountProviderMetadata[]>;
getAccountsForProvider(providerId: string): Thenable<azdata.Account[]>;
getSecurityToken(account: azdata.Account, resource: azdata.AzureResource): Thenable<{}>;
removeAccount(accountKey: azdata.AccountKey): Thenable<boolean>;
refreshAccount(account: azdata.Account): Thenable<azdata.Account>;
// UI METHODS //////////////////////////////////////////////////////////
openAccountListDialog(): Thenable<void>;
@@ -34,17 +34,17 @@ export interface IAccountManagementService {
copyUserCodeAndOpenBrowser(userCode: string, uri: string): void;
// SERVICE MANAGEMENT METHODS /////////////////////////////////////////
registerProvider(providerMetadata: sqlops.AccountProviderMetadata, provider: sqlops.AccountProvider): void;
registerProvider(providerMetadata: azdata.AccountProviderMetadata, provider: azdata.AccountProvider): void;
shutdown(): void;
unregisterProvider(providerMetadata: sqlops.AccountProviderMetadata): void;
unregisterProvider(providerMetadata: azdata.AccountProviderMetadata): void;
// EVENTING ////////////////////////////////////////////////////////////
readonly addAccountProviderEvent: Event<AccountProviderAddedEventParams>;
readonly removeAccountProviderEvent: Event<sqlops.AccountProviderMetadata>;
readonly removeAccountProviderEvent: Event<azdata.AccountProviderMetadata>;
readonly updateAccountListEvent: Event<UpdateAccountListEventParams>;
}
// Enum matching the AzureResource enum from sqlops.d.ts
// Enum matching the AzureResource enum from azdata.d.ts
export enum AzureResource {
ResourceManagement = 0,
Sql = 1
@@ -56,20 +56,20 @@ export interface IAccountStore {
* @param {Account} account Account to add/update
* @return {Thenable<AccountAdditionResult>} Results of the add/update operation
*/
addOrUpdate(account: sqlops.Account): Thenable<AccountAdditionResult>;
addOrUpdate(account: azdata.Account): Thenable<AccountAdditionResult>;
/**
* Retrieves all accounts, filtered by provider ID
* @param {string} providerId ID of the provider to filter by
* @return {Thenable<Account[]>} Promise to return all accounts that belong to the provided provider
*/
getAccountsByProvider(providerId: string): Thenable<sqlops.Account[]>;
getAccountsByProvider(providerId: string): Thenable<azdata.Account[]>;
/**
* Retrieves all accounts in the store. Returns empty array if store is not initialized
* @return {Thenable<Account[]>} Promise to return all accounts
*/
getAllAccounts(): Thenable<sqlops.Account[]>;
getAllAccounts(): Thenable<azdata.Account[]>;
/**
* Removes an account.
@@ -78,7 +78,7 @@ export interface IAccountStore {
* @param key - The key of an account.
* @returns True if the account was removed, false if the account doesn't exist
*/
remove(key: sqlops.AccountKey): Thenable<boolean>;
remove(key: azdata.AccountKey): Thenable<boolean>;
/**
* Updates the custom properties stored with an account.
@@ -88,5 +88,5 @@ export interface IAccountStore {
* @param updateOperation - Operation to perform on the matching account
* @returns True if the account was modified, false if the account doesn't exist
*/
update(key: sqlops.AccountKey, updateOperation: (account: sqlops.Account) => void): Thenable<boolean>;
update(key: azdata.AccountKey, updateOperation: (account: azdata.Account) => void): Thenable<boolean>;
}

8
src/sql/platform/backup/common/backupService.ts
View File

@@ -6,7 +6,7 @@
'use strict';
import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
import * as sqlops from 'sqlops';
import * as azdata from 'azdata';
export enum TaskExecutionMode {
execute = 0,
@@ -21,15 +21,15 @@ export const IBackupService = createDecorator<IBackupService>(SERVICE_ID);
export interface IBackupService {
_serviceBrand: any;
getBackupConfigInfo(connectionUri: string): Thenable<sqlops.BackupConfigInfo>;
getBackupConfigInfo(connectionUri: string): Thenable<azdata.BackupConfigInfo>;
/**
* Backup a data source using the provided connection
*/
backup(connectionUri: string, backupInfo: { [key: string]: any }, taskExecutionMode: sqlops.TaskExecutionMode): Thenable<sqlops.BackupResponse>;
backup(connectionUri: string, backupInfo: { [key: string]: any }, taskExecutionMode: azdata.TaskExecutionMode): Thenable<azdata.BackupResponse>;
/**
* Register a disaster recovery provider
*/
registerProvider(providerId: string, provider: sqlops.BackupProvider): void;
registerProvider(providerId: string, provider: azdata.BackupProvider): void;
}

14
src/sql/platform/backup/common/backupServiceImp.ts
View File

@@ -5,7 +5,7 @@
'use strict';
import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement';
import * as sqlops from 'sqlops';
import * as azdata from 'azdata';
import * as Constants from 'sql/common/constants';
import * as TelemetryKeys from 'sql/common/telemetryKeys';
import * as TelemetryUtils from 'sql/common/telemetryUtilities';
@@ -15,7 +15,7 @@ import { IBackupService, TaskExecutionMode } from 'sql/platform/backup/common/ba
export class BackupService implements IBackupService {
public _serviceBrand: any;
private _providers: { [handle: string]: sqlops.BackupProvider; } = Object.create(null);
private _providers: { [handle: string]: azdata.BackupProvider; } = Object.create(null);
constructor(
@IConnectionManagementService private _connectionService: IConnectionManagementService,
@@ -26,7 +26,7 @@ export class BackupService implements IBackupService {
/**
* Get database metadata needed to populate backup UI
*/
public getBackupConfigInfo(connectionUri: string): Thenable<sqlops.BackupConfigInfo> {
public getBackupConfigInfo(connectionUri: string): Thenable<azdata.BackupConfigInfo> {
let providerId: string = this._connectionService.getProviderIdFromUri(connectionUri);
if (providerId) {
let provider = this._providers[providerId];
@@ -40,8 +40,8 @@ export class BackupService implements IBackupService {
/**
* Backup a data source using the provided connection
*/
public backup(connectionUri: string, backupInfo: { [key: string]: any }, taskExecutionMode: TaskExecutionMode): Thenable<sqlops.BackupResponse> {
return new Promise<sqlops.BackupResponse>((resolve, reject) => {
public backup(connectionUri: string, backupInfo: { [key: string]: any }, taskExecutionMode: TaskExecutionMode): Thenable<azdata.BackupResponse> {
return new Promise<azdata.BackupResponse>((resolve, reject) => {
let providerResult = this.getProvider(connectionUri);
if (providerResult) {
TelemetryUtils.addTelemetry(this._telemetryService, TelemetryKeys.BackupCreated, { provider: providerResult.providerName });
@@ -56,7 +56,7 @@ export class BackupService implements IBackupService {
});
}
private getProvider(connectionUri: string): { provider: sqlops.BackupProvider, providerName: string } {
private getProvider(connectionUri: string): { provider: azdata.BackupProvider, providerName: string } {
let providerId: string = this._connectionService.getProviderIdFromUri(connectionUri);
if (providerId) {
return { provider: this._providers[providerId], providerName: providerId };
@@ -68,7 +68,7 @@ export class BackupService implements IBackupService {
/**
* Register a disaster recovery provider
*/
public registerProvider(providerId: string, provider: sqlops.BackupProvider): void {
public registerProvider(providerId: string, provider: azdata.BackupProvider): void {
this._providers[providerId] = provider;
}
}

14
src/sql/platform/capabilities/common/capabilitiesService.ts
View File

@@ -10,7 +10,7 @@ import * as Constants from 'sql/common/constants';
import { ConnectionProviderProperties, IConnectionProviderRegistry, Extensions as ConnectionExtensions } from 'sql/workbench/parts/connection/common/connectionProviderExtension';
import { toObject } from 'sql/base/common/map';
import * as sqlops from 'sqlops';
import * as azdata from 'azdata';
import { Event, Emitter } from 'vs/base/common/event';
import { IAction } from 'vs/base/common/actions';
@@ -24,7 +24,7 @@ import { IExtensionService } from 'vs/workbench/services/extensions/common/exten
import { getIdFromLocalExtensionId } from 'vs/platform/extensionManagement/common/extensionManagementUtil';
export const SERVICE_ID = 'capabilitiesService';
export const HOST_NAME = 'sqlops';
export const HOST_NAME = 'azdata';
export const HOST_VERSION = '1.0';
const connectionRegistry = Registry.as<IConnectionProviderRegistry>(ConnectionExtensions.ConnectionProviderContributions);
@@ -63,12 +63,12 @@ export interface ICapabilitiesService {
/**
* get the old version of provider information
*/
getLegacyCapabilities(provider: string): sqlops.DataProtocolServerCapabilities;
getLegacyCapabilities(provider: string): azdata.DataProtocolServerCapabilities;
/**
* Register a capabilities provider
*/
registerProvider(provider: sqlops.CapabilitiesProvider): void;
registerProvider(provider: azdata.CapabilitiesProvider): void;
/**
* Returns true if the feature is available for given connection
@@ -97,7 +97,7 @@ export class CapabilitiesService extends Disposable implements ICapabilitiesServ
private _momento: Memento;
private _providers = new Map<string, ProviderFeatures>();
private _featureUpdateEvents = new Map<string, Emitter<ProviderFeatures>>();
private _legacyProviders = new Map<string, sqlops.DataProtocolServerCapabilities>();
private _legacyProviders = new Map<string, azdata.DataProtocolServerCapabilities>();
private _onCapabilitiesRegistered = this._register(new Emitter<ProviderFeatures>());
public readonly onCapabilitiesRegistered = this._onCapabilitiesRegistered.event;
@@ -184,7 +184,7 @@ export class CapabilitiesService extends Disposable implements ICapabilitiesServ
return this._providers.get(provider);
}
public getLegacyCapabilities(provider: string): sqlops.DataProtocolServerCapabilities {
public getLegacyCapabilities(provider: string): azdata.DataProtocolServerCapabilities {
return this._legacyProviders.get(provider);
}
@@ -200,7 +200,7 @@ export class CapabilitiesService extends Disposable implements ICapabilitiesServ
* Register the capabilities provider and query the provider for its capabilities
* @param provider
*/
public registerProvider(provider: sqlops.CapabilitiesProvider): void {
public registerProvider(provider: azdata.CapabilitiesProvider): void {
// request the capabilities from server
provider.getServerCapabilities(clientCapabilities).then(serverCapabilities => {
this._legacyProviders.set(serverCapabilities.providerName, serverCapabilities);

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;
}

8
src/sql/platform/credentials/common/credentialsService.ts
View File

@@ -7,7 +7,7 @@
import { IDisposable, dispose } from 'vs/base/common/lifecycle';
import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
import * as sqlops from 'sqlops';
import * as azdata from 'azdata';
import { Deferred } from 'sql/base/common/promise';
export const SERVICE_ID = 'credentialsService';
@@ -15,7 +15,7 @@ export const SERVICE_ID = 'credentialsService';
export interface CredentialManagementEvents {
onSaveCredential(credentialId: string, password: string): Thenable<boolean>;
onReadCredential(credentialId: string): Thenable<sqlops.Credential>;
onReadCredential(credentialId: string): Thenable<azdata.Credential>;
onDeleteCredential(credentialId: string): Thenable<boolean>;
}
@@ -27,7 +27,7 @@ export interface ICredentialsService {
saveCredential(credentialId: string, password: string): Thenable<boolean>;
readCredential(credentialId: string): Thenable<sqlops.Credential>;
readCredential(credentialId: string): Thenable<azdata.Credential>;
deleteCredential(credentialId: string): Thenable<boolean>;
@@ -66,7 +66,7 @@ export class CredentialsService implements ICredentialsService {
return this._onServerEventsReady.promise.then(() => this._serverEvents[this._lastHandle].onSaveCredential(credentialId, password));
}
public readCredential(credentialId: string): Thenable<sqlops.Credential> {
public readCredential(credentialId: string): Thenable<azdata.Credential> {
return this._onServerEventsReady.promise.then(() => this._serverEvents[this._lastHandle].onReadCredential(credentialId));
}

34
src/sql/platform/dacfx/common/dacFxService.ts
View File

@@ -5,7 +5,7 @@
'use strict';
import * as sqlops from 'sqlops';
import * as azdata from 'azdata';
import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement';
import { TPromise } from 'vs/base/common/winjs.base';
@@ -17,65 +17,65 @@ export const IDacFxService = createDecorator<IDacFxService>(SERVICE_ID);
export interface IDacFxService {
_serviceBrand: any;
registerProvider(providerId: string, provider: sqlops.DacFxServicesProvider): void;
exportBacpac(sourceDatabaseName: string, packageFilePath: string, ownerUri: string, taskExecutionMode: sqlops.TaskExecutionMode): void;
importBacpac(packageFilePath: string, targetDatabaseName: string, ownerUri: string, taskExecutionMode: sqlops.TaskExecutionMode): void;
extractDacpac(sourceDatabaseName: string, packageFilePath: string, applicationName: string, applicationVersion: string, ownerUri: string, taskExecutionMode: sqlops.TaskExecutionMode): void;
deployDacpac(packageFilePath: string, targetDatabaseName: string, upgradeExisting: boolean, ownerUri: string, taskExecutionMode: sqlops.TaskExecutionMode): void;
generateDeployScript(packageFilePath: string, targetDatabaseName: string, scriptFilePath: string, ownerUri: string, taskExecutionMode: sqlops.TaskExecutionMode): void;
generateDeployPlan(packageFilePath: string, targetDatabaseName: string, ownerUri: string, taskExecutionMode: sqlops.TaskExecutionMode): void;
registerProvider(providerId: string, provider: azdata.DacFxServicesProvider): void;
exportBacpac(sourceDatabaseName: string, packageFilePath: string, ownerUri: string, taskExecutionMode: azdata.TaskExecutionMode): void;
importBacpac(packageFilePath: string, targetDatabaseName: string, ownerUri: string, taskExecutionMode: azdata.TaskExecutionMode): void;
extractDacpac(sourceDatabaseName: string, packageFilePath: string, applicationName: string, applicationVersion: string, ownerUri: string, taskExecutionMode: azdata.TaskExecutionMode): void;
deployDacpac(packageFilePath: string, targetDatabaseName: string, upgradeExisting: boolean, ownerUri: string, taskExecutionMode: azdata.TaskExecutionMode): void;
generateDeployScript(packageFilePath: string, targetDatabaseName: string, scriptFilePath: string, ownerUri: string, taskExecutionMode: azdata.TaskExecutionMode): void;
generateDeployPlan(packageFilePath: string, targetDatabaseName: string, ownerUri: string, taskExecutionMode: azdata.TaskExecutionMode): void;
}
export class DacFxService implements IDacFxService {
_serviceBrand: any;
private _providers: { [handle: string]: sqlops.DacFxServicesProvider; } = Object.create(null);
private _providers: { [handle: string]: azdata.DacFxServicesProvider; } = Object.create(null);
constructor(
@IConnectionManagementService private _connectionService: IConnectionManagementService
) {
}
registerProvider(providerId: string, provider: sqlops.DacFxServicesProvider): void {
registerProvider(providerId: string, provider: azdata.DacFxServicesProvider): void {
this._providers[providerId] = provider;
}
exportBacpac(databasesName: string, packageFilePath: string, ownerUri: string, taskExecutionMode: sqlops.TaskExecutionMode): Thenable<sqlops.DacFxResult> {
exportBacpac(databasesName: string, packageFilePath: string, ownerUri: string, taskExecutionMode: azdata.TaskExecutionMode): Thenable<azdata.DacFxResult> {
return this._runAction(ownerUri, (runner) => {
return runner.exportBacpac(databasesName, packageFilePath, ownerUri, taskExecutionMode);
});
}
importBacpac(packageFilePath: string, databaseName: string, ownerUri: string, taskExecutionMode: sqlops.TaskExecutionMode): Thenable<sqlops.DacFxResult> {
importBacpac(packageFilePath: string, databaseName: string, ownerUri: string, taskExecutionMode: azdata.TaskExecutionMode): Thenable<azdata.DacFxResult> {
return this._runAction(ownerUri, (runner) => {
return runner.importBacpac(packageFilePath, databaseName, ownerUri, taskExecutionMode);
});
}
extractDacpac(databaseName: string, packageFilePath: string, applicationName: string, applicationVersion: string, ownerUri: string, taskExecutionMode: sqlops.TaskExecutionMode): Thenable<sqlops.DacFxResult> {
extractDacpac(databaseName: string, packageFilePath: string, applicationName: string, applicationVersion: string, ownerUri: string, taskExecutionMode: azdata.TaskExecutionMode): Thenable<azdata.DacFxResult> {
return this._runAction(ownerUri, (runner) => {
return runner.extractDacpac(databaseName, packageFilePath, applicationName, applicationVersion, ownerUri, taskExecutionMode);
});
}
deployDacpac(packageFilePath: string, databaseName: string, upgradeExisting: boolean, ownerUri: string, taskExecutionMode: sqlops.TaskExecutionMode): Thenable<sqlops.DacFxResult> {
deployDacpac(packageFilePath: string, databaseName: string, upgradeExisting: boolean, ownerUri: string, taskExecutionMode: azdata.TaskExecutionMode): Thenable<azdata.DacFxResult> {
return this._runAction(ownerUri, (runner) => {
return runner.deployDacpac(packageFilePath, databaseName, upgradeExisting, ownerUri, taskExecutionMode);
});
}
generateDeployScript(packageFilePath: string, databaseName: string, generateDeployScript: string, ownerUri: string, taskExecutionMode: sqlops.TaskExecutionMode): Thenable<sqlops.DacFxResult> {
generateDeployScript(packageFilePath: string, databaseName: string, generateDeployScript: string, ownerUri: string, taskExecutionMode: azdata.TaskExecutionMode): Thenable<azdata.DacFxResult> {
return this._runAction(ownerUri, (runner) => {
return runner.generateDeployScript(packageFilePath, databaseName, generateDeployScript, ownerUri, taskExecutionMode);
});
}
generateDeployPlan(packageFilePath: string, databaseName: string, ownerUri: string, taskExecutionMode: sqlops.TaskExecutionMode): Thenable<sqlops.GenerateDeployPlanResult> {
generateDeployPlan(packageFilePath: string, databaseName: string, ownerUri: string, taskExecutionMode: azdata.TaskExecutionMode): Thenable<azdata.GenerateDeployPlanResult> {
return this._runAction(ownerUri, (runner) => {
return runner.generateDeployPlan(packageFilePath, databaseName, ownerUri, taskExecutionMode);
});
}
private _runAction<T>(uri: string, action: (handler: sqlops.DacFxServicesProvider) => Thenable<T>): Thenable<T> {
private _runAction<T>(uri: string, action: (handler: azdata.DacFxServicesProvider) => Thenable<T>): Thenable<T> {
let providerId: string = this._connectionService.getProviderIdFromUri(uri);
if (!providerId) {

10
src/sql/platform/dashboard/browser/dashboardService.ts
View File

@@ -7,20 +7,20 @@
import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
import { Event } from 'vs/base/common/event';
import * as DOM from 'vs/base/browser/dom';
import * as sqlops from 'sqlops';
import * as azdata from 'azdata';
export const IDashboardService = createDecorator<IDashboardService>('dashboardService');
export interface IDashboardService {
_serviceBrand: any;
readonly onDidOpenDashboard: Event<sqlops.DashboardDocument>;
readonly onDidChangeToDashboard: Event<sqlops.DashboardDocument>;
readonly onDidOpenDashboard: Event<azdata.DashboardDocument>;
readonly onDidChangeToDashboard: Event<azdata.DashboardDocument>;
readonly onLayout: Event<DOM.Dimension>;
openDashboard(document: sqlops.DashboardDocument): void;
openDashboard(document: azdata.DashboardDocument): void;
changeToDashboard(document: sqlops.DashboardDocument): void;
changeToDashboard(document: azdata.DashboardDocument): void;
layout(dimension: DOM.Dimension): void;
}

14
src/sql/platform/dashboard/browser/dashboardServiceImpl.ts
View File

@@ -7,24 +7,24 @@
import { IDashboardService } from './dashboardService';
import { Event, Emitter } from 'vs/base/common/event';
import * as DOM from 'vs/base/browser/dom';
import * as sqlops from 'sqlops';
import * as azdata from 'azdata';
export class DashboardService implements IDashboardService {
public _serviceBrand: any;
private _onDidOpenDashboard = new Emitter<sqlops.DashboardDocument>();
public readonly onDidOpenDashboard: Event<sqlops.DashboardDocument> = this._onDidOpenDashboard.event;
private _onDidOpenDashboard = new Emitter<azdata.DashboardDocument>();
public readonly onDidOpenDashboard: Event<azdata.DashboardDocument> = this._onDidOpenDashboard.event;
private _onDidChangeToDashboard = new Emitter<sqlops.DashboardDocument>();
public readonly onDidChangeToDashboard: Event<sqlops.DashboardDocument> = this._onDidChangeToDashboard.event;
private _onDidChangeToDashboard = new Emitter<azdata.DashboardDocument>();
public readonly onDidChangeToDashboard: Event<azdata.DashboardDocument> = this._onDidChangeToDashboard.event;
private _onLayout = new Emitter<DOM.Dimension>();
public readonly onLayout: Event<DOM.Dimension> = this._onLayout.event;
public openDashboard(document: sqlops.DashboardDocument): void {
public openDashboard(document: azdata.DashboardDocument): void {
this._onDidOpenDashboard.fire(document);
}
public changeToDashboard(document: sqlops.DashboardDocument): void {
public changeToDashboard(document: azdata.DashboardDocument): void {
this._onDidChangeToDashboard.fire(document);
}

1
src/sql/platform/dialog/customDialogService.ts
View File

@@ -5,7 +5,6 @@
'use strict';
import * as sqlops from 'sqlops';
import { OptionsDialog } from 'sql/workbench/browser/modal/optionsDialog';
import { DialogModal } from 'sql/platform/dialog/dialogModal';
import { WizardModal } from 'sql/platform/dialog/wizardModal';

10
src/sql/platform/dialog/dialogTypes.ts
View File

@@ -5,7 +5,7 @@
'use strict';
import * as sqlops from 'sqlops';
import * as azdata from 'azdata';
import { localize } from 'vs/nls';
import { Event, Emitter } from 'vs/base/common/event';
import { DialogMessage } from 'sql/workbench/api/common/sqlExtHostTypes';
@@ -80,7 +80,7 @@ export class Dialog extends ModelViewPane {
}
}
export class DialogButton implements sqlops.window.Button {
export class DialogButton implements azdata.window.Button {
private _label: string;
private _enabled: boolean;
private _hidden: boolean;
@@ -169,13 +169,13 @@ export class Wizard {
public cancelButton: DialogButton;
public customButtons: DialogButton[];
private _currentPage: number;
private _pageChangedEmitter = new Emitter<sqlops.window.WizardPageChangeInfo>();
private _pageChangedEmitter = new Emitter<azdata.window.WizardPageChangeInfo>();
public readonly onPageChanged = this._pageChangedEmitter.event;
private _pageAddedEmitter = new Emitter<WizardPage>();
public readonly onPageAdded = this._pageAddedEmitter.event;
private _pageRemovedEmitter = new Emitter<WizardPage>();
public readonly onPageRemoved = this._pageRemovedEmitter.event;
private _navigationValidator: (pageChangeInfo: sqlops.window.WizardPageChangeInfo) => boolean | Thenable<boolean>;
private _navigationValidator: (pageChangeInfo: azdata.window.WizardPageChangeInfo) => boolean | Thenable<boolean>;
private _onMessageChange = new Emitter<DialogMessage>();
public readonly onMessageChange = this._onMessageChange.event;
private _message: DialogMessage;
@@ -233,7 +233,7 @@ export class Wizard {
this._pageRemovedEmitter.fire(removedPage);
}
public registerNavigationValidator(validator: (pageChangeInfo: sqlops.window.WizardPageChangeInfo) => boolean | Thenable<boolean>): void {
public registerNavigationValidator(validator: (pageChangeInfo: azdata.window.WizardPageChangeInfo) => boolean | Thenable<boolean>): void {
this._navigationValidator = validator;
}

24
src/sql/platform/fileBrowser/common/fileBrowserService.ts
View File

@@ -5,7 +5,7 @@
'use strict';
import * as sqlops from 'sqlops';
import * as azdata from 'azdata';
import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement';
import { FileBrowserTree } from 'sql/workbench/services/fileBrowser/common/fileBrowserTree';
import { FileNode } from 'sql/workbench/services/fileBrowser/common/fileNode';
@@ -20,10 +20,10 @@ import * as strings from 'vs/base/common/strings';
export class FileBrowserService implements IFileBrowserService {
public _serviceBrand: any;
private _providers: { [handle: string]: sqlops.FileBrowserProvider; } = Object.create(null);
private _providers: { [handle: string]: azdata.FileBrowserProvider; } = Object.create(null);
private _onAddFileTree = new Emitter<FileBrowserTree>();
private _onExpandFolder = new Emitter<FileNode>();
private _onPathValidate = new Emitter<sqlops.FileBrowserValidatedParams>();
private _onPathValidate = new Emitter<azdata.FileBrowserValidatedParams>();
private _pathToFileNodeMap: { [path: string]: FileNode } = {};
private _expandResolveMap: { [key: string]: any } = {};
static fileNodeId: number = 0;
@@ -32,7 +32,7 @@ export class FileBrowserService implements IFileBrowserService {
@IErrorMessageService private _errorMessageService: IErrorMessageService) {
}
public registerProvider(providerId: string, provider: sqlops.FileBrowserProvider): void {
public registerProvider(providerId: string, provider: azdata.FileBrowserProvider): void {
this._providers[providerId] = provider;
}
@@ -44,7 +44,7 @@ export class FileBrowserService implements IFileBrowserService {
return this._onExpandFolder.event;
}
public get onPathValidate(): Event<sqlops.FileBrowserValidatedParams> {
public get onPathValidate(): Event<azdata.FileBrowserValidatedParams> {
return this._onPathValidate.event;
}
@@ -63,7 +63,7 @@ export class FileBrowserService implements IFileBrowserService {
});
}
public onFileBrowserOpened(handle: number, fileBrowserOpenedParams: sqlops.FileBrowserOpenedParams) {
public onFileBrowserOpened(handle: number, fileBrowserOpenedParams: azdata.FileBrowserOpenedParams) {
if (fileBrowserOpenedParams.succeeded === true
&& fileBrowserOpenedParams.fileTree
&& fileBrowserOpenedParams.fileTree.rootNode
@@ -97,7 +97,7 @@ export class FileBrowserService implements IFileBrowserService {
});
}
public onFolderNodeExpanded(handle: number, fileBrowserExpandedParams: sqlops.FileBrowserExpandedParams) {
public onFolderNodeExpanded(handle: number, fileBrowserExpandedParams: azdata.FileBrowserExpandedParams) {
var mapKey = this.generateResolveMapKey(fileBrowserExpandedParams.ownerUri, fileBrowserExpandedParams.expandPath);
var expandResolve = this._expandResolveMap[mapKey];
if (expandResolve) {
@@ -134,11 +134,11 @@ export class FileBrowserService implements IFileBrowserService {
});
}
public onFilePathsValidated(handle: number, fileBrowserValidatedParams: sqlops.FileBrowserValidatedParams) {
public onFilePathsValidated(handle: number, fileBrowserValidatedParams: azdata.FileBrowserValidatedParams) {
this._onPathValidate.fire(fileBrowserValidatedParams);
}
public closeFileBrowser(ownerUri: string): Thenable<sqlops.FileBrowserCloseResponse> {
public closeFileBrowser(ownerUri: string): Thenable<azdata.FileBrowserCloseResponse> {
let provider = this.getProvider(ownerUri);
if (provider) {
return provider.closeFileBrowser(ownerUri);
@@ -149,7 +149,7 @@ export class FileBrowserService implements IFileBrowserService {
private generateResolveMapKey(ownerUri: string, expandPath: string): string {
return ownerUri + ':' + expandPath;
}
private getProvider(connectionUri: string): sqlops.FileBrowserProvider {
private getProvider(connectionUri: string): azdata.FileBrowserProvider {
let providerId: string = this._connectionService.getProviderIdFromUri(connectionUri);
if (providerId) {
return this._providers[providerId];
@@ -158,7 +158,7 @@ export class FileBrowserService implements IFileBrowserService {
}
}
private convertFileTree(parentNode: FileNode, fileTreeNode: sqlops.FileTreeNode, expandPath: string, ownerUri: string): FileBrowserTree {
private convertFileTree(parentNode: FileNode, fileTreeNode: azdata.FileTreeNode, expandPath: string, ownerUri: string): FileBrowserTree {
FileBrowserService.fileNodeId += 1;
var expandedNodes: FileNode[] = [];
var selectedNode: FileNode;
@@ -207,7 +207,7 @@ export class FileBrowserService implements IFileBrowserService {
return { rootNode: fileNode, selectedNode: selectedNode, expandedNodes: expandedNodes };
}
private convertChildren(expandedNode: FileNode, childrenToConvert: sqlops.FileTreeNode[], ownerUri: string): FileNode[] {
private convertChildren(expandedNode: FileNode, childrenToConvert: azdata.FileTreeNode[], ownerUri: string): FileNode[] {
var childrenNodes = [];
for (var i = 0; i < childrenToConvert.length; i++) {

14
src/sql/platform/fileBrowser/common/interfaces.ts
View File

@@ -5,7 +5,7 @@
'use strict';
import * as sqlops from 'sqlops';
import * as azdata from 'azdata';
import { FileBrowserTree } from 'sql/workbench/services/fileBrowser/common/fileBrowserTree';
import { FileNode } from 'sql/workbench/services/fileBrowser/common/fileNode';
import { Event } from 'vs/base/common/event';
@@ -16,12 +16,12 @@ export interface IFileBrowserService {
_serviceBrand: any;
onAddFileTree: Event<FileBrowserTree>;
onExpandFolder: Event<FileNode>;
onPathValidate: Event<sqlops.FileBrowserValidatedParams>;
onPathValidate: Event<azdata.FileBrowserValidatedParams>;
/**
* Register file browser provider
*/
registerProvider(providerId: string, provider: sqlops.FileBrowserProvider): void;
registerProvider(providerId: string, provider: azdata.FileBrowserProvider): void;
/**
* Open file browser
@@ -31,7 +31,7 @@ export interface IFileBrowserService {
/**
* Event called when file browser is opened
*/
onFileBrowserOpened(handle: number, fileBrowserOpenedParams: sqlops.FileBrowserOpenedParams);
onFileBrowserOpened(handle: number, fileBrowserOpenedParams: azdata.FileBrowserOpenedParams);
/**
* Expand folder node
@@ -41,7 +41,7 @@ export interface IFileBrowserService {
/**
* Event called when children nodes are retrieved
*/
onFolderNodeExpanded(handle: number, fileBrowserExpandedParams: sqlops.FileBrowserExpandedParams);
onFolderNodeExpanded(handle: number, fileBrowserExpandedParams: azdata.FileBrowserExpandedParams);
/**
* Validate selected file paths
@@ -51,10 +51,10 @@ export interface IFileBrowserService {
/**
* Event called when the validation is complete
*/
onFilePathsValidated(handle: number, fileBrowserValidatedParams: sqlops.FileBrowserValidatedParams);
onFilePathsValidated(handle: number, fileBrowserValidatedParams: azdata.FileBrowserValidatedParams);
/**
* Close file browser
*/
closeFileBrowser(ownerUri: string): Thenable<sqlops.FileBrowserCloseResponse>;
closeFileBrowser(ownerUri: string): Thenable<azdata.FileBrowserCloseResponse>;
}

28
src/sql/platform/jobManagement/common/interfaces.ts
View File

@@ -5,7 +5,7 @@
'use strict';
import * as sqlops from 'sqlops';
import * as azdata from 'azdata';
import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
import { JobCacheObject, AlertsCacheObject, ProxiesCacheObject, OperatorsCacheObject } from './jobManagementService';
import { Event } from 'vs/base/common/event';
@@ -18,27 +18,27 @@ export interface IJobManagementService {
_serviceBrand: any;
onDidChange: Event<void>;
registerProvider(providerId: string, provider: sqlops.AgentServicesProvider): void;
registerProvider(providerId: string, provider: azdata.AgentServicesProvider): void;
fireOnDidChange(): void;
getJobs(connectionUri: string): Thenable<sqlops.AgentJobsResult>;
getJobHistory(connectionUri: string, jobID: string, jobName: string): Thenable<sqlops.AgentJobHistoryResult>;
deleteJob(connectionUri: string, job: sqlops.AgentJobInfo): Thenable<sqlops.ResultStatus>;
getJobs(connectionUri: string): Thenable<azdata.AgentJobsResult>;
getJobHistory(connectionUri: string, jobID: string, jobName: string): Thenable<azdata.AgentJobHistoryResult>;
deleteJob(connectionUri: string, job: azdata.AgentJobInfo): Thenable<azdata.ResultStatus>;
deleteJobStep(connectionUri: string, step: sqlops.AgentJobStepInfo): Thenable<sqlops.ResultStatus>;
deleteJobStep(connectionUri: string, step: azdata.AgentJobStepInfo): Thenable<azdata.ResultStatus>;
getAlerts(connectionUri: string): Thenable<sqlops.AgentAlertsResult>;
deleteAlert(connectionUri: string, alert: sqlops.AgentAlertInfo): Thenable<sqlops.ResultStatus>;
getAlerts(connectionUri: string): Thenable<azdata.AgentAlertsResult>;
deleteAlert(connectionUri: string, alert: azdata.AgentAlertInfo): Thenable<azdata.ResultStatus>;
getOperators(connectionUri: string): Thenable<sqlops.AgentOperatorsResult>;
deleteOperator(connectionUri: string, operator: sqlops.AgentOperatorInfo): Thenable<sqlops.ResultStatus>;
getOperators(connectionUri: string): Thenable<azdata.AgentOperatorsResult>;
deleteOperator(connectionUri: string, operator: azdata.AgentOperatorInfo): Thenable<azdata.ResultStatus>;
getProxies(connectionUri: string): Thenable<sqlops.AgentProxiesResult>;
deleteProxy(connectionUri: string, proxy: sqlops.AgentProxyInfo): Thenable<sqlops.ResultStatus>;
getProxies(connectionUri: string): Thenable<azdata.AgentProxiesResult>;
deleteProxy(connectionUri: string, proxy: azdata.AgentProxyInfo): Thenable<azdata.ResultStatus>;
getCredentials(connectionUri: string): Thenable<sqlops.GetCredentialsResult>;
getCredentials(connectionUri: string): Thenable<azdata.GetCredentialsResult>;
jobAction(connectionUri: string, jobName: string, action: string): Thenable<sqlops.ResultStatus>;
jobAction(connectionUri: string, jobName: string, action: string): Thenable<azdata.ResultStatus>;
addToCache(server: string, cache: JobCacheObject | OperatorsCacheObject);
jobCacheObjectMap: { [server: string]: JobCacheObject; };
operatorsCacheObjectMap: { [server: string]: OperatorsCacheObject; };

12
src/sql/platform/jobManagement/common/jobActions.ts
View File

@@ -6,7 +6,7 @@
import { TPromise } from 'vs/base/common/winjs.base';
import { Action } from 'vs/base/common/actions';
import * as nls from 'vs/nls';
import * as sqlops from 'sqlops';
import * as azdata from 'azdata';
import { INotificationService } from 'vs/platform/notification/common/notification';
import Severity from 'vs/base/common/severity';
import { JobHistoryComponent } from 'sql/parts/jobManagement/views/jobHistory.component';
@@ -184,7 +184,7 @@ export class DeleteJobAction extends Action {
public run(actionInfo: IJobActionInfo): TPromise<boolean> {
let self = this;
let job = actionInfo.targetObject as sqlops.AgentJobInfo;
let job = actionInfo.targetObject as azdata.AgentJobInfo;
self._notificationService.prompt(
Severity.Info,
nls.localize('jobaction.deleteJobConfirm', "Are you sure you'd like to delete the job '{0}'?", job.name),
@@ -250,7 +250,7 @@ export class DeleteStepAction extends Action {
public run(actionInfo: IJobActionInfo): TPromise<boolean> {
let self = this;
let step = actionInfo.targetObject as sqlops.AgentJobStepInfo;
let step = actionInfo.targetObject as azdata.AgentJobStepInfo;
let refreshAction = this.instantationService.createInstance(JobsRefreshAction);
self._notificationService.prompt(
Severity.Info,
@@ -339,7 +339,7 @@ export class DeleteAlertAction extends Action {
public run(actionInfo: IJobActionInfo): TPromise<boolean> {
let self = this;
let alert = actionInfo.targetObject as sqlops.AgentAlertInfo;
let alert = actionInfo.targetObject as azdata.AgentAlertInfo;
self._notificationService.prompt(
Severity.Info,
nls.localize('jobaction.deleteAlertConfirm', "Are you sure you'd like to delete the alert '{0}'?", alert.name),
@@ -424,7 +424,7 @@ export class DeleteOperatorAction extends Action {
public run(actionInfo: IJobActionInfo): TPromise<boolean> {
const self = this;
let operator = actionInfo.targetObject as sqlops.AgentOperatorInfo;
let operator = actionInfo.targetObject as azdata.AgentOperatorInfo;
self._notificationService.prompt(
Severity.Info,
nls.localize('jobaction.deleteOperatorConfirm', "Are you sure you'd like to delete the operator '{0}'?", operator.name),
@@ -510,7 +510,7 @@ export class DeleteProxyAction extends Action {
public run(actionInfo: IJobActionInfo): TPromise<boolean> {
let self = this;
let proxy = actionInfo.targetObject as sqlops.AgentProxyInfo;
let proxy = actionInfo.targetObject as azdata.AgentProxyInfo;
self._notificationService.prompt(
Severity.Info,
nls.localize('jobaction.deleteProxyConfirm', "Are you sure you'd like to delete the proxy '{0}'?", proxy.accountName),

84
src/sql/platform/jobManagement/common/jobManagementService.ts
View File

@@ -6,7 +6,7 @@
'use strict';
import { localize } from 'vs/nls';
import * as sqlops from 'sqlops';
import * as azdata from 'azdata';
import { TPromise } from 'vs/base/common/winjs.base';
import { IJobManagementService } from 'sql/platform/jobManagement/common/interfaces';
import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement';
@@ -18,7 +18,7 @@ export class JobManagementService implements IJobManagementService {
private _onDidChange = new Emitter<void>();
public readonly onDidChange: Event<void> = this._onDidChange.event;
private _providers: { [handle: string]: sqlops.AgentServicesProvider; } = Object.create(null);
private _providers: { [handle: string]: azdata.AgentServicesProvider; } = Object.create(null);
private _jobCacheObjectMap: { [server: string]: JobCacheObject; } = {};
private _operatorsCacheObjectMap: { [server: string]: OperatorsCacheObject; } = {};
private _alertsCacheObject: { [server: string]: AlertsCacheObject; } = {};
@@ -34,32 +34,32 @@ export class JobManagementService implements IJobManagementService {
}
// Jobs
public getJobs(connectionUri: string): Thenable<sqlops.AgentJobsResult> {
public getJobs(connectionUri: string): Thenable<azdata.AgentJobsResult> {
return this._runAction(connectionUri, (runner) => {
return runner.getJobs(connectionUri);
});
}
public deleteJob(connectionUri: string, job: sqlops.AgentJobInfo): Thenable<sqlops.ResultStatus> {
public deleteJob(connectionUri: string, job: azdata.AgentJobInfo): Thenable<azdata.ResultStatus> {
return this._runAction(connectionUri, (runner) => {
return runner.deleteJob(connectionUri, job);
});
}
public getJobHistory(connectionUri: string, jobID: string, jobName: string): Thenable<sqlops.AgentJobHistoryResult> {
public getJobHistory(connectionUri: string, jobID: string, jobName: string): Thenable<azdata.AgentJobHistoryResult> {
return this._runAction(connectionUri, (runner) => {
return runner.getJobHistory(connectionUri, jobID, jobName);
});
}
public jobAction(connectionUri: string, jobName: string, action: string): Thenable<sqlops.ResultStatus> {
public jobAction(connectionUri: string, jobName: string, action: string): Thenable<azdata.ResultStatus> {
return this._runAction(connectionUri, (runner) => {
return runner.jobAction(connectionUri, jobName, action);
});
}
// Steps
public deleteJobStep(connectionUri: string, stepInfo: sqlops.AgentJobStepInfo): Thenable<sqlops.ResultStatus> {
public deleteJobStep(connectionUri: string, stepInfo: azdata.AgentJobStepInfo): Thenable<azdata.ResultStatus> {
return this._runAction(connectionUri, (runner) => {
return runner.deleteJobStep(connectionUri, stepInfo);
});
@@ -67,51 +67,51 @@ export class JobManagementService implements IJobManagementService {
// Alerts
public getAlerts(connectionUri: string): Thenable<sqlops.AgentAlertsResult> {
public getAlerts(connectionUri: string): Thenable<azdata.AgentAlertsResult> {
return this._runAction(connectionUri, (runner) => {
return runner.getAlerts(connectionUri);
});
}
public deleteAlert(connectionUri: string, alert: sqlops.AgentAlertInfo): Thenable<sqlops.ResultStatus> {
public deleteAlert(connectionUri: string, alert: azdata.AgentAlertInfo): Thenable<azdata.ResultStatus> {
return this._runAction(connectionUri, (runner) => {
return runner.deleteAlert(connectionUri, alert);
});
}
// Operators
public getOperators(connectionUri: string): Thenable<sqlops.AgentOperatorsResult> {
public getOperators(connectionUri: string): Thenable<azdata.AgentOperatorsResult> {
return this._runAction(connectionUri, (runner) => {
return runner.getOperators(connectionUri);
});
}
public deleteOperator(connectionUri: string, operator: sqlops.AgentOperatorInfo): Thenable<sqlops.ResultStatus> {
public deleteOperator(connectionUri: string, operator: azdata.AgentOperatorInfo): Thenable<azdata.ResultStatus> {
return this._runAction(connectionUri, (runner) => {
return runner.deleteOperator(connectionUri, operator);
});
}
// Proxies
public getProxies(connectionUri: string): Thenable<sqlops.AgentProxiesResult> {
public getProxies(connectionUri: string): Thenable<azdata.AgentProxiesResult> {
return this._runAction(connectionUri, (runner) => {
return runner.getProxies(connectionUri);
});
}
public deleteProxy(connectionUri: string, proxy: sqlops.AgentProxyInfo): Thenable<sqlops.ResultStatus> {
public deleteProxy(connectionUri: string, proxy: azdata.AgentProxyInfo): Thenable<azdata.ResultStatus> {
return this._runAction(connectionUri, (runner) => {
return runner.deleteProxy(connectionUri, proxy);
});
}
public getCredentials(connectionUri: string): Thenable<sqlops.GetCredentialsResult> {
public getCredentials(connectionUri: string): Thenable<azdata.GetCredentialsResult> {
return this._runAction(connectionUri, (runner) => {
return runner.getCredentials(connectionUri);
});
}
private _runAction<T>(uri: string, action: (handler: sqlops.AgentServicesProvider) => Thenable<T>): Thenable<T> {
private _runAction<T>(uri: string, action: (handler: azdata.AgentServicesProvider) => Thenable<T>): Thenable<T> {
let providerId: string = this._connectionService.getProviderIdFromUri(uri);
if (!providerId) {
@@ -125,7 +125,7 @@ export class JobManagementService implements IJobManagementService {
}
}
public registerProvider(providerId: string, provider: sqlops.AgentServicesProvider): void {
public registerProvider(providerId: string, provider: azdata.AgentServicesProvider): void {
this._providers[providerId] = provider;
}
@@ -163,22 +163,22 @@ export class JobManagementService implements IJobManagementService {
*/
export class JobCacheObject {
_serviceBrand: any;
private _jobs: sqlops.AgentJobInfo[] = [];
private _jobHistories: { [jobID: string]: sqlops.AgentJobHistoryInfo[]; } = {};
private _jobSteps: { [jobID: string]: sqlops.AgentJobStepInfo[]; } = {};
private _jobAlerts: { [jobID: string]: sqlops.AgentAlertInfo[]; } = {};
private _jobSchedules: { [jobID: string]: sqlops.AgentJobScheduleInfo[]; } = {};
private _jobs: azdata.AgentJobInfo[] = [];
private _jobHistories: { [jobID: string]: azdata.AgentJobHistoryInfo[]; } = {};
private _jobSteps: { [jobID: string]: azdata.AgentJobStepInfo[]; } = {};
private _jobAlerts: { [jobID: string]: azdata.AgentAlertInfo[]; } = {};
private _jobSchedules: { [jobID: string]: azdata.AgentJobScheduleInfo[]; } = {};
private _runCharts: { [jobID: string]: string[]; } = {};
private _prevJobID: string;
private _serverName: string;
private _dataView: Slick.Data.DataView<any>;
/* Getters */
public get jobs(): sqlops.AgentJobInfo[] {
public get jobs(): azdata.AgentJobInfo[] {
return this._jobs;
}
public get jobHistories(): { [jobID: string]: sqlops.AgentJobHistoryInfo[] } {
public get jobHistories(): { [jobID: string]: azdata.AgentJobHistoryInfo[] } {
return this._jobHistories;
}
@@ -186,7 +186,7 @@ export class JobCacheObject {
return this._prevJobID;
}
public getJobHistory(jobID: string): sqlops.AgentJobHistoryInfo[] {
public getJobHistory(jobID: string): azdata.AgentJobHistoryInfo[] {
return this._jobHistories[jobID];
}
@@ -202,24 +202,24 @@ export class JobCacheObject {
return this._runCharts[jobID];
}
public getJobSteps(jobID: string): sqlops.AgentJobStepInfo[] {
public getJobSteps(jobID: string): azdata.AgentJobStepInfo[] {
return this._jobSteps[jobID];
}
public getJobAlerts(jobID: string): sqlops.AgentAlertInfo[] {
public getJobAlerts(jobID: string): azdata.AgentAlertInfo[] {
return this._jobAlerts[jobID];
}
public getJobSchedules(jobID: string): sqlops.AgentJobScheduleInfo[] {
public getJobSchedules(jobID: string): azdata.AgentJobScheduleInfo[] {
return this._jobSchedules[jobID];
}
/* Setters */
public set jobs(value: sqlops.AgentJobInfo[]) {
public set jobs(value: azdata.AgentJobInfo[]) {
this._jobs = value;
}
public set jobHistories(value: { [jobID: string]: sqlops.AgentJobHistoryInfo[]; }) {
public set jobHistories(value: { [jobID: string]: azdata.AgentJobHistoryInfo[]; }) {
this._jobHistories = value;
}
@@ -227,7 +227,7 @@ export class JobCacheObject {
this._prevJobID = value;
}
public setJobHistory(jobID: string, value: sqlops.AgentJobHistoryInfo[]) {
public setJobHistory(jobID: string, value: azdata.AgentJobHistoryInfo[]) {
this._jobHistories[jobID] = value;
}
@@ -243,15 +243,15 @@ export class JobCacheObject {
this._dataView = value;
}
public setJobSteps(jobID: string, value: sqlops.AgentJobStepInfo[]) {
public setJobSteps(jobID: string, value: azdata.AgentJobStepInfo[]) {
this._jobSteps[jobID] = value;
}
public setJobAlerts(jobID: string, value: sqlops.AgentAlertInfo[]) {
public setJobAlerts(jobID: string, value: azdata.AgentAlertInfo[]) {
this._jobAlerts[jobID] = value;
}
public setJobSchedules(jobID: string, value: sqlops.AgentJobScheduleInfo[]) {
public setJobSchedules(jobID: string, value: azdata.AgentJobScheduleInfo[]) {
this._jobSchedules[jobID] = value;
}
}
@@ -261,12 +261,12 @@ export class JobCacheObject {
*/
export class OperatorsCacheObject {
_serviceBrand: any;
private _operators: sqlops.AgentOperatorInfo[];
private _operators: azdata.AgentOperatorInfo[];
private _dataView: Slick.Data.DataView<any>;
private _serverName: string;
/** Getters */
public get operators(): sqlops.AgentOperatorInfo[] {
public get operators(): azdata.AgentOperatorInfo[] {
return this._operators;
}
@@ -279,7 +279,7 @@ export class OperatorsCacheObject {
}
/** Setters */
public set operators(value: sqlops.AgentOperatorInfo[]) {
public set operators(value: azdata.AgentOperatorInfo[]) {
this._operators = value;
}
@@ -298,12 +298,12 @@ export class OperatorsCacheObject {
*/
export class AlertsCacheObject {
_serviceBrand: any;
private _alerts: sqlops.AgentAlertInfo[];
private _alerts: azdata.AgentAlertInfo[];
private _dataView: Slick.Data.DataView<any>;
private _serverName: string;
/** Getters */
public get alerts(): sqlops.AgentAlertInfo[] {
public get alerts(): azdata.AgentAlertInfo[] {
return this._alerts;
}
@@ -316,7 +316,7 @@ export class AlertsCacheObject {
}
/** Setters */
public set alerts(value: sqlops.AgentAlertInfo[]) {
public set alerts(value: azdata.AgentAlertInfo[]) {
this._alerts = value;
}
@@ -335,14 +335,14 @@ export class AlertsCacheObject {
*/
export class ProxiesCacheObject {
_serviceBrand: any;
private _proxies: sqlops.AgentProxyInfo[];
private _proxies: azdata.AgentProxyInfo[];
private _dataView: Slick.Data.DataView<any>;
private _serverName: string;
/**
* Getters
*/
public get proxies(): sqlops.AgentProxyInfo[] {
public get proxies(): azdata.AgentProxyInfo[] {
return this._proxies;
}
@@ -356,7 +356,7 @@ export class ProxiesCacheObject {
/** Setters */
public set proxies(value: sqlops.AgentProxyInfo[]) {
public set proxies(value: azdata.AgentProxyInfo[]) {
this._proxies = value;
}

20
src/sql/platform/metadata/common/metadataService.ts
View File

@@ -8,7 +8,7 @@
import { IDisposable, dispose } from 'vs/base/common/lifecycle';
import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement';
import * as sqlops from 'sqlops';
import * as azdata from 'azdata';
export const SERVICE_ID = 'metadataService';
@@ -17,18 +17,18 @@ export const IMetadataService = createDecorator<IMetadataService>(SERVICE_ID);
export interface IMetadataService {
_serviceBrand: any;
getMetadata(connectionUri: string): Thenable<sqlops.ProviderMetadata>;
getMetadata(connectionUri: string): Thenable<azdata.ProviderMetadata>;
getDatabaseNames(connectionUri: string): Thenable<string[]>;
getTableInfo(connectionUri: string, metadata: sqlops.ObjectMetadata): Thenable<sqlops.ColumnMetadata[]>;
getTableInfo(connectionUri: string, metadata: azdata.ObjectMetadata): Thenable<azdata.ColumnMetadata[]>;
getViewInfo(connectionUri: string, metadata: sqlops.ObjectMetadata): Thenable<sqlops.ColumnMetadata[]>;
getViewInfo(connectionUri: string, metadata: azdata.ObjectMetadata): Thenable<azdata.ColumnMetadata[]>;
/**
* Register a metadata provider
*/
registerProvider(providerId: string, provider: sqlops.MetadataProvider): void;
registerProvider(providerId: string, provider: azdata.MetadataProvider): void;
}
export class MetadataService implements IMetadataService {
@@ -37,12 +37,12 @@ export class MetadataService implements IMetadataService {
private _disposables: IDisposable[] = [];
private _providers: { [handle: string]: sqlops.MetadataProvider; } = Object.create(null);
private _providers: { [handle: string]: azdata.MetadataProvider; } = Object.create(null);
constructor( @IConnectionManagementService private _connectionService: IConnectionManagementService) {
}
public getMetadata(connectionUri: string): Thenable<sqlops.ProviderMetadata> {
public getMetadata(connectionUri: string): Thenable<azdata.ProviderMetadata> {
let providerId: string = this._connectionService.getProviderIdFromUri(connectionUri);
if (providerId) {
let provider = this._providers[providerId];
@@ -66,7 +66,7 @@ export class MetadataService implements IMetadataService {
return Promise.resolve([]);
}
public getTableInfo(connectionUri: string, metadata: sqlops.ObjectMetadata): Thenable<sqlops.ColumnMetadata[]> {
public getTableInfo(connectionUri: string, metadata: azdata.ObjectMetadata): Thenable<azdata.ColumnMetadata[]> {
let providerId: string = this._connectionService.getProviderIdFromUri(connectionUri);
if (providerId) {
let provider = this._providers[providerId];
@@ -78,7 +78,7 @@ export class MetadataService implements IMetadataService {
return Promise.resolve(undefined);
}
public getViewInfo(connectionUri: string, metadata: sqlops.ObjectMetadata): Thenable<sqlops.ColumnMetadata[]> {
public getViewInfo(connectionUri: string, metadata: azdata.ObjectMetadata): Thenable<azdata.ColumnMetadata[]> {
let providerId: string = this._connectionService.getProviderIdFromUri(connectionUri);
if (providerId) {
let provider = this._providers[providerId];
@@ -93,7 +93,7 @@ export class MetadataService implements IMetadataService {
/**
* Register a metadata provider
*/
public registerProvider(providerId: string, provider: sqlops.MetadataProvider): void {
public registerProvider(providerId: string, provider: azdata.MetadataProvider): void {
this._providers[providerId] = provider;
}

6
src/sql/platform/model/common/modelViewService.ts
View File

@@ -4,15 +4,15 @@
*--------------------------------------------------------------------------------------------*/
'use strict';
import * as sqlops from 'sqlops';
import * as azdata from 'azdata';
import { IItemConfig, IComponentShape } from 'sql/workbench/api/common/sqlExtHostTypes';
import { IComponentEventArgs } from 'sql/parts/modelComponents/interfaces';
import { Event } from 'vs/base/common/event';
export interface IView {
readonly id: string;
readonly connection: sqlops.connection.Connection;
readonly serverInfo: sqlops.ServerInfo;
readonly connection: azdata.connection.Connection;
readonly serverInfo: azdata.ServerInfo;
}
export interface IModelViewEventArgs extends IComponentEventArgs {

2
src/sql/platform/node/resultSerializer.ts
View File

@@ -7,7 +7,7 @@ import * as ConnectionConstants from 'sql/platform/connection/common/constants';
import * as Constants from 'sql/parts/query/common/constants';
import * as LocalizedConstants from 'sql/parts/query/common/localizedConstants';
import * as WorkbenchUtils from 'sql/workbench/common/sqlWorkbenchUtils';
import { SaveResultsRequestParams } from 'sqlops';
import { SaveResultsRequestParams } from 'azdata';
import { IQueryManagementService } from 'sql/platform/query/common/queryManagement';
import { ISaveRequest, SaveFormat } from 'sql/parts/grid/common/interfaces';

88
src/sql/platform/query/common/queryManagement.ts
View File

@@ -7,7 +7,7 @@ import QueryRunner from 'sql/platform/query/common/queryRunner';
import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement';
import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
import { IDisposable } from 'vs/base/common/lifecycle';
import * as sqlops from 'sqlops';
import * as azdata from 'azdata';
import { TPromise } from 'vs/base/common/winjs.base';
import * as TelemetryKeys from 'sql/common/telemetryKeys';
import * as TelemetryUtils from 'sql/common/telemetryUtilities';
@@ -26,23 +26,23 @@ export interface IQueryManagementService {
getRegisteredProviders(): string[];
registerRunner(runner: QueryRunner, uri: string): void;
cancelQuery(ownerUri: string): Thenable<sqlops.QueryCancelResult>;
runQuery(ownerUri: string, selection: sqlops.ISelectionData, runOptions?: sqlops.ExecutionPlanOptions): Thenable<void>;
cancelQuery(ownerUri: string): Thenable<azdata.QueryCancelResult>;
runQuery(ownerUri: string, selection: azdata.ISelectionData, runOptions?: azdata.ExecutionPlanOptions): Thenable<void>;
runQueryStatement(ownerUri: string, line: number, column: number): Thenable<void>;
runQueryString(ownerUri: string, queryString: string): Thenable<void>;
runQueryAndReturn(ownerUri: string, queryString: string): Thenable<sqlops.SimpleExecuteResult>;
parseSyntax(ownerUri: string, query: string): Thenable<sqlops.SyntaxParseResult>;
getQueryRows(rowData: sqlops.QueryExecuteSubsetParams): Thenable<sqlops.QueryExecuteSubsetResult>;
runQueryAndReturn(ownerUri: string, queryString: string): Thenable<azdata.SimpleExecuteResult>;
parseSyntax(ownerUri: string, query: string): Thenable<azdata.SyntaxParseResult>;
getQueryRows(rowData: azdata.QueryExecuteSubsetParams): Thenable<azdata.QueryExecuteSubsetResult>;
disposeQuery(ownerUri: string): Thenable<void>;
saveResults(requestParams: sqlops.SaveResultsRequestParams): Thenable<sqlops.SaveResultRequestResult>;
saveResults(requestParams: azdata.SaveResultsRequestParams): Thenable<azdata.SaveResultRequestResult>;
// Callbacks
onQueryComplete(result: sqlops.QueryExecuteCompleteNotificationResult): void;
onBatchStart(batchInfo: sqlops.QueryExecuteBatchNotificationParams): void;
onBatchComplete(batchInfo: sqlops.QueryExecuteBatchNotificationParams): void;
onResultSetAvailable(resultSetInfo: sqlops.QueryExecuteResultSetNotificationParams): void;
onResultSetUpdated(resultSetInfo: sqlops.QueryExecuteResultSetNotificationParams): void;
onMessage(message: sqlops.QueryExecuteMessageParams): void;
onQueryComplete(result: azdata.QueryExecuteCompleteNotificationResult): void;
onBatchStart(batchInfo: azdata.QueryExecuteBatchNotificationParams): void;
onBatchComplete(batchInfo: azdata.QueryExecuteBatchNotificationParams): void;
onResultSetAvailable(resultSetInfo: azdata.QueryExecuteResultSetNotificationParams): void;
onResultSetUpdated(resultSetInfo: azdata.QueryExecuteResultSetNotificationParams): void;
onMessage(message: azdata.QueryExecuteMessageParams): void;
// Edit Data Callbacks
onEditSessionReady(ownerUri: string, success: boolean, message: string): void;
@@ -50,39 +50,39 @@ export interface IQueryManagementService {
// Edit Data Functions
initializeEdit(ownerUri: string, schemaName: string, objectName: string, objectType: string, rowLimit: number, queryString: string): Thenable<void>;
disposeEdit(ownerUri: string): Thenable<void>;
updateCell(ownerUri: string, rowId: number, columnId: number, newValue: string): Thenable<sqlops.EditUpdateCellResult>;
updateCell(ownerUri: string, rowId: number, columnId: number, newValue: string): Thenable<azdata.EditUpdateCellResult>;
commitEdit(ownerUri): Thenable<void>;
createRow(ownerUri: string): Thenable<sqlops.EditCreateRowResult>;
createRow(ownerUri: string): Thenable<azdata.EditCreateRowResult>;
deleteRow(ownerUri: string, rowId: number): Thenable<void>;
revertCell(ownerUri: string, rowId: number, columnId: number): Thenable<sqlops.EditRevertCellResult>;
revertCell(ownerUri: string, rowId: number, columnId: number): Thenable<azdata.EditRevertCellResult>;
revertRow(ownerUri: string, rowId: number): Thenable<void>;
getEditRows(rowData: sqlops.EditSubsetParams): Thenable<sqlops.EditSubsetResult>;
getEditRows(rowData: azdata.EditSubsetParams): Thenable<azdata.EditSubsetResult>;
}
/*
* An object that can handle basic request-response actions related to queries
*/
export interface IQueryRequestHandler {
cancelQuery(ownerUri: string): Thenable<sqlops.QueryCancelResult>;
runQuery(ownerUri: string, selection: sqlops.ISelectionData, runOptions?: sqlops.ExecutionPlanOptions): Thenable<void>;
cancelQuery(ownerUri: string): Thenable<azdata.QueryCancelResult>;
runQuery(ownerUri: string, selection: azdata.ISelectionData, runOptions?: azdata.ExecutionPlanOptions): Thenable<void>;
runQueryStatement(ownerUri: string, line: number, column: number): Thenable<void>;
runQueryString(ownerUri: string, queryString: string): Thenable<void>;
runQueryAndReturn(ownerUri: string, queryString: string): Thenable<sqlops.SimpleExecuteResult>;
parseSyntax(ownerUri: string, query: string): Thenable<sqlops.SyntaxParseResult>;
getQueryRows(rowData: sqlops.QueryExecuteSubsetParams): Thenable<sqlops.QueryExecuteSubsetResult>;
runQueryAndReturn(ownerUri: string, queryString: string): Thenable<azdata.SimpleExecuteResult>;
parseSyntax(ownerUri: string, query: string): Thenable<azdata.SyntaxParseResult>;
getQueryRows(rowData: azdata.QueryExecuteSubsetParams): Thenable<azdata.QueryExecuteSubsetResult>;
disposeQuery(ownerUri: string): Thenable<void>;
saveResults(requestParams: sqlops.SaveResultsRequestParams): Thenable<sqlops.SaveResultRequestResult>;
saveResults(requestParams: azdata.SaveResultsRequestParams): Thenable<azdata.SaveResultRequestResult>;
// Edit Data actions
initializeEdit(ownerUri: string, schemaName: string, objectName: string, objectType: string, rowLimit: number, queryString: string): Thenable<void>;
disposeEdit(ownerUri: string): Thenable<void>;
updateCell(ownerUri: string, rowId: number, columnId: number, newValue: string): Thenable<sqlops.EditUpdateCellResult>;
updateCell(ownerUri: string, rowId: number, columnId: number, newValue: string): Thenable<azdata.EditUpdateCellResult>;
commitEdit(ownerUri): Thenable<void>;
createRow(ownerUri: string): Thenable<sqlops.EditCreateRowResult>;
createRow(ownerUri: string): Thenable<azdata.EditCreateRowResult>;
deleteRow(ownerUri: string, rowId: number): Thenable<void>;
revertCell(ownerUri: string, rowId: number, columnId: number): Thenable<sqlops.EditRevertCellResult>;
revertCell(ownerUri: string, rowId: number, columnId: number): Thenable<azdata.EditRevertCellResult>;
revertRow(ownerUri: string, rowId: number): Thenable<void>;
getEditRows(rowData: sqlops.EditSubsetParams): Thenable<sqlops.EditSubsetResult>;
getEditRows(rowData: azdata.EditSubsetParams): Thenable<azdata.EditSubsetResult>;
}
export class QueryManagementService implements IQueryManagementService {
@@ -161,7 +161,7 @@ export class QueryManagementService implements IQueryManagementService {
return Array.from(this._requestHandlers.keys());
}
private addTelemetry(eventName: string, ownerUri: string, runOptions?: sqlops.ExecutionPlanOptions): void {
private addTelemetry(eventName: string, ownerUri: string, runOptions?: azdata.ExecutionPlanOptions): void {
let providerId: string = this._connectionService.getProviderIdFromUri(ownerUri);
let data: TelemetryUtils.IConnectionTelemetryData = {
provider: providerId,
@@ -189,13 +189,13 @@ export class QueryManagementService implements IQueryManagementService {
}
}
public cancelQuery(ownerUri: string): Thenable<sqlops.QueryCancelResult> {
public cancelQuery(ownerUri: string): Thenable<azdata.QueryCancelResult> {
this.addTelemetry(TelemetryKeys.CancelQuery, ownerUri);
return this._runAction(ownerUri, (runner) => {
return runner.cancelQuery(ownerUri);
});
}
public runQuery(ownerUri: string, selection: sqlops.ISelectionData, runOptions?: sqlops.ExecutionPlanOptions): Thenable<void> {
public runQuery(ownerUri: string, selection: azdata.ISelectionData, runOptions?: azdata.ExecutionPlanOptions): Thenable<void> {
this.addTelemetry(TelemetryKeys.RunQuery, ownerUri, runOptions);
return this._runAction(ownerUri, (runner) => {
return runner.runQuery(ownerUri, selection, runOptions);
@@ -212,17 +212,17 @@ export class QueryManagementService implements IQueryManagementService {
return runner.runQueryString(ownerUri, queryString);
});
}
public runQueryAndReturn(ownerUri: string, queryString: string): Thenable<sqlops.SimpleExecuteResult> {
public runQueryAndReturn(ownerUri: string, queryString: string): Thenable<azdata.SimpleExecuteResult> {
return this._runAction(ownerUri, (runner) => {
return runner.runQueryAndReturn(ownerUri, queryString);
});
}
public parseSyntax(ownerUri: string, query: string): Thenable<sqlops.SyntaxParseResult> {
public parseSyntax(ownerUri: string, query: string): Thenable<azdata.SyntaxParseResult> {
return this._runAction(ownerUri, (runner) => {
return runner.parseSyntax(ownerUri, query);
});
}
public getQueryRows(rowData: sqlops.QueryExecuteSubsetParams): Thenable<sqlops.QueryExecuteSubsetResult> {
public getQueryRows(rowData: azdata.QueryExecuteSubsetParams): Thenable<azdata.QueryExecuteSubsetResult> {
return this._runAction(rowData.ownerUri, (runner) => {
return runner.getQueryRows(rowData);
});
@@ -234,42 +234,42 @@ export class QueryManagementService implements IQueryManagementService {
});
}
public saveResults(requestParams: sqlops.SaveResultsRequestParams): Thenable<sqlops.SaveResultRequestResult> {
public saveResults(requestParams: azdata.SaveResultsRequestParams): Thenable<azdata.SaveResultRequestResult> {
return this._runAction(requestParams.ownerUri, (runner) => {
return runner.saveResults(requestParams);
});
}
public onQueryComplete(result: sqlops.QueryExecuteCompleteNotificationResult): void {
public onQueryComplete(result: azdata.QueryExecuteCompleteNotificationResult): void {
this._notify(result.ownerUri, (runner: QueryRunner) => {
runner.handleQueryComplete(result);
});
}
public onBatchStart(batchInfo: sqlops.QueryExecuteBatchNotificationParams): void {
public onBatchStart(batchInfo: azdata.QueryExecuteBatchNotificationParams): void {
this._notify(batchInfo.ownerUri, (runner: QueryRunner) => {
runner.handleBatchStart(batchInfo);
});
}
public onBatchComplete(batchInfo: sqlops.QueryExecuteBatchNotificationParams): void {
public onBatchComplete(batchInfo: azdata.QueryExecuteBatchNotificationParams): void {
this._notify(batchInfo.ownerUri, (runner: QueryRunner) => {
runner.handleBatchComplete(batchInfo);
});
}
public onResultSetAvailable(resultSetInfo: sqlops.QueryExecuteResultSetNotificationParams): void {
public onResultSetAvailable(resultSetInfo: azdata.QueryExecuteResultSetNotificationParams): void {
this._notify(resultSetInfo.ownerUri, (runner: QueryRunner) => {
runner.handleResultSetAvailable(resultSetInfo);
});
}
public onResultSetUpdated(resultSetInfo: sqlops.QueryExecuteResultSetNotificationParams): void {
public onResultSetUpdated(resultSetInfo: azdata.QueryExecuteResultSetNotificationParams): void {
this._notify(resultSetInfo.ownerUri, (runner: QueryRunner) => {
runner.handleResultSetUpdated(resultSetInfo);
});
}
public onMessage(message: sqlops.QueryExecuteMessageParams): void {
public onMessage(message: azdata.QueryExecuteMessageParams): void {
this._notify(message.ownerUri, (runner: QueryRunner) => {
runner.handleMessage(message);
});
@@ -288,7 +288,7 @@ export class QueryManagementService implements IQueryManagementService {
});
}
public updateCell(ownerUri: string, rowId: number, columnId: number, newValue: string): Thenable<sqlops.EditUpdateCellResult> {
public updateCell(ownerUri: string, rowId: number, columnId: number, newValue: string): Thenable<azdata.EditUpdateCellResult> {
return this._runAction(ownerUri, (runner) => {
return runner.updateCell(ownerUri, rowId, columnId, newValue);
});
@@ -300,7 +300,7 @@ export class QueryManagementService implements IQueryManagementService {
});
}
public createRow(ownerUri: string): Thenable<sqlops.EditCreateRowResult> {
public createRow(ownerUri: string): Thenable<azdata.EditCreateRowResult> {
return this._runAction(ownerUri, (runner) => {
return runner.createRow(ownerUri);
});
@@ -318,7 +318,7 @@ export class QueryManagementService implements IQueryManagementService {
});
}
public revertCell(ownerUri: string, rowId: number, columnId: number): Thenable<sqlops.EditRevertCellResult> {
public revertCell(ownerUri: string, rowId: number, columnId: number): Thenable<azdata.EditRevertCellResult> {
return this._runAction(ownerUri, (runner) => {
return runner.revertCell(ownerUri, rowId, columnId);
});
@@ -330,7 +330,7 @@ export class QueryManagementService implements IQueryManagementService {
});
}
public getEditRows(rowData: sqlops.EditSubsetParams): Thenable<sqlops.EditSubsetResult> {
public getEditRows(rowData: azdata.EditSubsetParams): Thenable<azdata.EditSubsetResult> {
return this._runAction(rowData.ownerUri, (runner) => {
return runner.getEditRows(rowData);
});

2
src/sql/platform/query/common/queryModel.ts
View File

@@ -17,7 +17,7 @@ import {
EditCreateRowResult,
EditRevertCellResult,
ExecutionPlanOptions
} from 'sqlops';
} from 'azdata';
import { QueryInfo } from 'sql/platform/query/common/queryModelService';
export const SERVICE_ID = 'queryModelService';

32
src/sql/platform/query/common/queryModelService.ts
View File

@@ -16,7 +16,7 @@ import { SqlFlavorStatusbarItem } from 'sql/parts/query/common/flavorStatus';
import { RowCountStatusBarItem } from 'sql/parts/query/common/rowCountStatus';
import { TimeElapsedStatusBarItem } from 'sql/parts/query/common/timeElapsedStatus';
import * as sqlops from 'sqlops';
import * as azdata from 'azdata';
import * as nls from 'vs/nls';
import * as statusbar from 'vs/workbench/browser/parts/statusbar/statusbar';
@@ -44,7 +44,7 @@ export class QueryInfo {
public queryRunner: QueryRunner;
public dataService: DataService;
public queryEventQueue: QueryEvent[];
public selection: Array<sqlops.ISelectionData>;
public selection: Array<azdata.ISelectionData>;
public queryInput: QueryInput;
public selectionSnippet: string;
@@ -69,12 +69,12 @@ export class QueryModelService implements IQueryModelService {
private _queryInfoMap: Map<string, QueryInfo>;
private _onRunQueryStart: Emitter<string>;
private _onRunQueryComplete: Emitter<string>;
private _onEditSessionReady: Emitter<sqlops.EditSessionReadyParams>;
private _onEditSessionReady: Emitter<azdata.EditSessionReadyParams>;
// EVENTS /////////////////////////////////////////////////////////////
public get onRunQueryStart(): Event<string> { return this._onRunQueryStart.event; }
public get onRunQueryComplete(): Event<string> { return this._onRunQueryComplete.event; }
public get onEditSessionReady(): Event<sqlops.EditSessionReadyParams> { return this._onEditSessionReady.event; }
public get onEditSessionReady(): Event<azdata.EditSessionReadyParams> { return this._onEditSessionReady.event; }
// CONSTRUCTOR /////////////////////////////////////////////////////////
constructor(
@@ -84,7 +84,7 @@ export class QueryModelService implements IQueryModelService {
this._queryInfoMap = new Map<string, QueryInfo>();
this._onRunQueryStart = new Emitter<string>();
this._onRunQueryComplete = new Emitter<string>();
this._onEditSessionReady = new Emitter<sqlops.EditSessionReadyParams>();
this._onEditSessionReady = new Emitter<azdata.EditSessionReadyParams>();
// Register Statusbar items
@@ -157,13 +157,13 @@ export class QueryModelService implements IQueryModelService {
/**
* Get more data rows from the current resultSets from the service layer
*/
public getQueryRows(uri: string, rowStart: number, numberOfRows: number, batchId: number, resultId: number): Thenable<sqlops.ResultSetSubset> {
public getQueryRows(uri: string, rowStart: number, numberOfRows: number, batchId: number, resultId: number): Thenable<azdata.ResultSetSubset> {
return this._getQueryInfo(uri).queryRunner.getQueryRows(rowStart, numberOfRows, batchId, resultId).then(results => {
return results.resultSubset;
});
}
public getEditRows(uri: string, rowStart: number, numberOfRows: number): Thenable<sqlops.EditSubsetResult> {
public getEditRows(uri: string, rowStart: number, numberOfRows: number): Thenable<azdata.EditSubsetResult> {
return this._queryInfoMap.get(uri).queryRunner.getEditRows(rowStart, numberOfRows).then(results => {
return results;
});
@@ -210,14 +210,14 @@ export class QueryModelService implements IQueryModelService {
/**
* Run a query for the given URI with the given text selection
*/
public runQuery(uri: string, selection: sqlops.ISelectionData, queryInput: QueryInput, runOptions?: sqlops.ExecutionPlanOptions): void {
public runQuery(uri: string, selection: azdata.ISelectionData, queryInput: QueryInput, runOptions?: azdata.ExecutionPlanOptions): void {
this.doRunQuery(uri, selection, queryInput, false, runOptions);
}
/**
* Run the current SQL statement for the given URI
*/
public runQueryStatement(uri: string, selection: sqlops.ISelectionData, queryInput: QueryInput): void {
public runQueryStatement(uri: string, selection: azdata.ISelectionData, queryInput: QueryInput): void {
this.doRunQuery(uri, selection, queryInput, true);
}
@@ -231,8 +231,8 @@ export class QueryModelService implements IQueryModelService {
/**
* Run Query implementation
*/
private doRunQuery(uri: string, selection: sqlops.ISelectionData | string, queryInput: QueryInput,
runCurrentStatement: boolean, runOptions?: sqlops.ExecutionPlanOptions): void {
private doRunQuery(uri: string, selection: azdata.ISelectionData | string, queryInput: QueryInput,
runCurrentStatement: boolean, runOptions?: azdata.ExecutionPlanOptions): void {
// Reuse existing query runner if it exists
let queryRunner: QueryRunner;
let info: QueryInfo;
@@ -463,7 +463,7 @@ export class QueryModelService implements IQueryModelService {
return TPromise.as(null);
}
public updateCell(ownerUri: string, rowId: number, columnId: number, newValue: string): Thenable<sqlops.EditUpdateCellResult> {
public updateCell(ownerUri: string, rowId: number, columnId: number, newValue: string): Thenable<azdata.EditUpdateCellResult> {
// Get existing query runner
let queryRunner = this.internalGetQueryRunner(ownerUri);
if (queryRunner) {
@@ -493,7 +493,7 @@ export class QueryModelService implements IQueryModelService {
return TPromise.as(null);
}
public createRow(ownerUri: string): Thenable<sqlops.EditCreateRowResult> {
public createRow(ownerUri: string): Thenable<azdata.EditCreateRowResult> {
// Get existing query runner
let queryRunner = this.internalGetQueryRunner(ownerUri);
if (queryRunner) {
@@ -511,7 +511,7 @@ export class QueryModelService implements IQueryModelService {
return TPromise.as(null);
}
public revertCell(ownerUri: string, rowId: number, columnId: number): Thenable<sqlops.EditRevertCellResult> {
public revertCell(ownerUri: string, rowId: number, columnId: number): Thenable<azdata.EditRevertCellResult> {
// Get existing query runner
let queryRunner = this.internalGetQueryRunner(ownerUri);
if (queryRunner) {
@@ -595,9 +595,9 @@ export class QueryModelService implements IQueryModelService {
// TODO remove this funciton and its usages when #821 in vscode-mssql is fixed and
// the SqlToolsService version is updated in this repo - coquagli 4/19/2017
private _validateSelection(selection: sqlops.ISelectionData): sqlops.ISelectionData {
private _validateSelection(selection: azdata.ISelectionData): azdata.ISelectionData {
if (!selection) {
selection = <sqlops.ISelectionData>{};
selection = <azdata.ISelectionData>{};
}
selection.endColumn = selection ? Math.max(0, selection.endColumn) : 0;
selection.endLine = selection ? Math.max(0, selection.endLine) : 0;

96
src/sql/platform/query/common/queryRunner.ts
View File

@@ -5,7 +5,7 @@
'use strict';
import * as sqlops from 'sqlops';
import * as azdata from 'azdata';
import * as Constants from 'sql/parts/query/common/constants';
import * as WorkbenchUtils from 'sql/workbench/common/sqlWorkbenchUtils';
@@ -48,15 +48,15 @@ export const enum EventType {
export interface IEventType {
start: void;
complete: string;
message: sqlops.IResultMessage;
batchStart: sqlops.BatchSummary;
batchComplete: sqlops.BatchSummary;
resultSet: sqlops.ResultSetSummary;
message: azdata.IResultMessage;
batchStart: azdata.BatchSummary;
batchComplete: azdata.BatchSummary;
resultSet: azdata.ResultSetSummary;
editSessionReady: IEditSessionReadyEvent;
}
export interface IGridMessage extends sqlops.IResultMessage {
selection: sqlops.ISelectionData;
export interface IGridMessage extends azdata.IResultMessage {
selection: azdata.ISelectionData;
}
/*
@@ -69,8 +69,8 @@ export default class QueryRunner extends Disposable {
private _totalElapsedMilliseconds: number = 0;
private _isExecuting: boolean = false;
private _hasCompleted: boolean = false;
private _batchSets: sqlops.BatchSummary[] = [];
private _messages: sqlops.IResultMessage[] = [];
private _batchSets: azdata.BatchSummary[] = [];
private _messages: azdata.IResultMessage[] = [];
private _eventEmitter = new EventEmitter();
private _isQueryPlan: boolean;
@@ -78,13 +78,13 @@ export default class QueryRunner extends Disposable {
private _planXml = new Deferred<string>();
public get planXml(): Thenable<string> { return this._planXml.promise; }
private _onMessage = this._register(new Emitter<sqlops.IResultMessage>());
private _onMessage = this._register(new Emitter<azdata.IResultMessage>());
public readonly onMessage = this._onMessage.event;
private _onResultSet = this._register(new Emitter<sqlops.ResultSetSummary>());
private _onResultSet = this._register(new Emitter<azdata.ResultSetSummary>());
public readonly onResultSet = this._onResultSet.event;
private _onResultSetUpdate = this._register(new Emitter<sqlops.ResultSetSummary>());
private _onResultSetUpdate = this._register(new Emitter<azdata.ResultSetSummary>());
public readonly onResultSetUpdate = this._onResultSetUpdate.event;
private _onQueryStart = this._register(new Emitter<void>());
@@ -93,11 +93,11 @@ export default class QueryRunner extends Disposable {
private _onQueryEnd = this._register(new Emitter<string>());
public readonly onQueryEnd: Event<string> = this._onQueryEnd.event;
private _onBatchStart = this._register(new Emitter<sqlops.BatchSummary>());
public readonly onBatchStart: Event<sqlops.BatchSummary> = this._onBatchStart.event;
private _onBatchStart = this._register(new Emitter<azdata.BatchSummary>());
public readonly onBatchStart: Event<azdata.BatchSummary> = this._onBatchStart.event;
private _onBatchEnd = this._register(new Emitter<sqlops.BatchSummary>());
public readonly onBatchEnd: Event<sqlops.BatchSummary> = this._onBatchEnd.event;
private _onBatchEnd = this._register(new Emitter<azdata.BatchSummary>());
public readonly onBatchEnd: Event<azdata.BatchSummary> = this._onBatchEnd.event;
private _queryStartTime: Date;
public get queryStartTime(): Date {
@@ -132,14 +132,14 @@ export default class QueryRunner extends Disposable {
/**
* For public use only, for private use, directly access the member
*/
public get batchSets(): sqlops.BatchSummary[] {
public get batchSets(): azdata.BatchSummary[] {
return this._batchSets.slice(0);
}
/**
* For public use only, for private use, directly access the member
*/
public get messages(): sqlops.IResultMessage[] {
public get messages(): azdata.IResultMessage[] {
return this._messages.slice(0);
}
@@ -152,7 +152,7 @@ export default class QueryRunner extends Disposable {
/**
* Cancels the running query, if there is one
*/
public cancelQuery(): Thenable<sqlops.QueryCancelResult> {
public cancelQuery(): Thenable<azdata.QueryCancelResult> {
return this._queryManagementService.cancelQuery(this.uri);
}
@@ -160,13 +160,13 @@ export default class QueryRunner extends Disposable {
* Runs the query with the provided query
* @param input Query string to execute
*/
public runQuery(input: string, runOptions?: sqlops.ExecutionPlanOptions): Thenable<void>;
public runQuery(input: string, runOptions?: azdata.ExecutionPlanOptions): Thenable<void>;
/**
* Runs the query by pulling the query from the document using the provided selection data
* @param input selection data
*/
public runQuery(input: sqlops.ISelectionData, runOptions?: sqlops.ExecutionPlanOptions): Thenable<void>;
public runQuery(input, runOptions?: sqlops.ExecutionPlanOptions): Thenable<void> {
public runQuery(input: azdata.ISelectionData, runOptions?: azdata.ExecutionPlanOptions): Thenable<void>;
public runQuery(input, runOptions?: azdata.ExecutionPlanOptions): Thenable<void> {
return this.doRunQuery(input, false, runOptions);
}
@@ -174,7 +174,7 @@ export default class QueryRunner extends Disposable {
* Runs the current SQL statement by pulling the query from the document using the provided selection data
* @param input selection data
*/
public runQueryStatement(input: sqlops.ISelectionData): Thenable<void> {
public runQueryStatement(input: azdata.ISelectionData): Thenable<void> {
return this.doRunQuery(input, true);
}
@@ -182,9 +182,9 @@ export default class QueryRunner extends Disposable {
* Implementation that runs the query with the provided query
* @param input Query string to execute
*/
private doRunQuery(input: string, runCurrentStatement: boolean, runOptions?: sqlops.ExecutionPlanOptions): Thenable<void>;
private doRunQuery(input: sqlops.ISelectionData, runCurrentStatement: boolean, runOptions?: sqlops.ExecutionPlanOptions): Thenable<void>;
private doRunQuery(input, runCurrentStatement: boolean, runOptions?: sqlops.ExecutionPlanOptions): Thenable<void> {
private doRunQuery(input: string, runCurrentStatement: boolean, runOptions?: azdata.ExecutionPlanOptions): Thenable<void>;
private doRunQuery(input: azdata.ISelectionData, runCurrentStatement: boolean, runOptions?: azdata.ExecutionPlanOptions): Thenable<void>;
private doRunQuery(input, runCurrentStatement: boolean, runOptions?: azdata.ExecutionPlanOptions): Thenable<void> {
if (this.isExecuting) {
return TPromise.as(undefined);
}
@@ -235,20 +235,20 @@ export default class QueryRunner extends Disposable {
// Attempting to launch the query failed, show the error message
const eol = this.getEolString();
let message = nls.localize('query.ExecutionFailedError', 'Execution failed due to an unexpected error: {0}\t{1}', eol, error);
this.handleMessage(<sqlops.QueryExecuteMessageParams>{
this.handleMessage(<azdata.QueryExecuteMessageParams>{
ownerUri: this.uri,
message: {
isError: true,
message: message
}
});
this.handleQueryComplete(<sqlops.QueryExecuteCompleteNotificationResult>{ ownerUri: this.uri });
this.handleQueryComplete(<azdata.QueryExecuteCompleteNotificationResult>{ ownerUri: this.uri });
}
/**
* Handle a QueryComplete from the service layer
*/
public handleQueryComplete(result: sqlops.QueryExecuteCompleteNotificationResult): void {
public handleQueryComplete(result: azdata.QueryExecuteCompleteNotificationResult): void {
// this also isn't exact but its the best we can do
this._queryEndTime = new Date();
@@ -283,7 +283,7 @@ export default class QueryRunner extends Disposable {
/**
* Handle a BatchStart from the service layer
*/
public handleBatchStart(result: sqlops.QueryExecuteBatchNotificationParams): void {
public handleBatchStart(result: azdata.QueryExecuteBatchNotificationParams): void {
let batch = result.batchSummary;
// Recalculate the start and end lines, relative to the result line offset
@@ -314,8 +314,8 @@ export default class QueryRunner extends Disposable {
/**
* Handle a BatchComplete from the service layer
*/
public handleBatchComplete(result: sqlops.QueryExecuteBatchNotificationParams): void {
let batch: sqlops.BatchSummary = result.batchSummary;
public handleBatchComplete(result: azdata.QueryExecuteBatchNotificationParams): void {
let batch: azdata.BatchSummary = result.batchSummary;
// Store the batch again to get the rest of the data
this._batchSets[batch.id] = batch;
@@ -333,17 +333,17 @@ export default class QueryRunner extends Disposable {
/**
* Handle a ResultSetComplete from the service layer
*/
public handleResultSetAvailable(result: sqlops.QueryExecuteResultSetNotificationParams): void {
public handleResultSetAvailable(result: azdata.QueryExecuteResultSetNotificationParams): void {
if (result && result.resultSetSummary) {
let resultSet = result.resultSetSummary;
let batchSet: sqlops.BatchSummary;
let batchSet: azdata.BatchSummary;
if (!resultSet.batchId) {
// Missing the batchId. In this case, default to always using the first batch in the list
// or create one in the case the DMP extension didn't obey the contract perfectly
if (this._batchSets.length > 0) {
batchSet = this._batchSets[0];
} else {
batchSet = <sqlops.BatchSummary>{
batchSet = <azdata.BatchSummary>{
id: 0,
selection: undefined,
hasError: false,
@@ -373,10 +373,10 @@ export default class QueryRunner extends Disposable {
}
}
public handleResultSetUpdated(result: sqlops.QueryExecuteResultSetNotificationParams): void {
public handleResultSetUpdated(result: azdata.QueryExecuteResultSetNotificationParams): void {
if (result && result.resultSetSummary) {
let resultSet = result.resultSetSummary;
let batchSet: sqlops.BatchSummary;
let batchSet: azdata.BatchSummary;
batchSet = this._batchSets[resultSet.batchId];
// handle getting queryPlanxml if we need too
if (this.isQueryPlan) {
@@ -397,7 +397,7 @@ export default class QueryRunner extends Disposable {
/**
* Handle a Mssage from the service layer
*/
public handleMessage(obj: sqlops.QueryExecuteMessageParams): void {
public handleMessage(obj: azdata.QueryExecuteMessageParams): void {
let message = obj.message;
message.time = new Date(message.time).toLocaleTimeString();
this._messages.push(message);
@@ -410,8 +410,8 @@ export default class QueryRunner extends Disposable {
/**
* Get more data rows from the current resultSets from the service layer
*/
public getQueryRows(rowStart: number, numberOfRows: number, batchIndex: number, resultSetIndex: number): Thenable<sqlops.QueryExecuteSubsetResult> {
let rowData: sqlops.QueryExecuteSubsetParams = <sqlops.QueryExecuteSubsetParams>{
public getQueryRows(rowStart: number, numberOfRows: number, batchIndex: number, resultSetIndex: number): Thenable<azdata.QueryExecuteSubsetResult> {
let rowData: azdata.QueryExecuteSubsetParams = <azdata.QueryExecuteSubsetParams>{
ownerUri: this.uri,
resultSetIndex: resultSetIndex,
rowsCount: numberOfRows,
@@ -458,15 +458,15 @@ export default class QueryRunner extends Disposable {
* @param rowStart The index of the row to start returning (inclusive)
* @param numberOfRows The number of rows to return
*/
public getEditRows(rowStart: number, numberOfRows: number): Thenable<sqlops.EditSubsetResult> {
public getEditRows(rowStart: number, numberOfRows: number): Thenable<azdata.EditSubsetResult> {
const self = this;
let rowData: sqlops.EditSubsetParams = {
let rowData: azdata.EditSubsetParams = {
ownerUri: this.uri,
rowCount: numberOfRows,
rowStartIndex: rowStart
};
return new Promise<sqlops.EditSubsetResult>((resolve, reject) => {
return new Promise<azdata.EditSubsetResult>((resolve, reject) => {
self._queryManagementService.getEditRows(rowData).then(result => {
if (!result.hasOwnProperty('rowCount')) {
let error = `Nothing returned from subset query`;
@@ -492,7 +492,7 @@ export default class QueryRunner extends Disposable {
this._eventEmitter.emit(EventType.EDIT_SESSION_READY, { ownerUri, success, message });
}
public updateCell(ownerUri: string, rowId: number, columnId: number, newValue: string): Thenable<sqlops.EditUpdateCellResult> {
public updateCell(ownerUri: string, rowId: number, columnId: number, newValue: string): Thenable<azdata.EditUpdateCellResult> {
return this._queryManagementService.updateCell(ownerUri, rowId, columnId, newValue);
}
@@ -500,7 +500,7 @@ export default class QueryRunner extends Disposable {
return this._queryManagementService.commitEdit(ownerUri);
}
public createRow(ownerUri: string): Thenable<sqlops.EditCreateRowResult> {
public createRow(ownerUri: string): Thenable<azdata.EditCreateRowResult> {
return this._queryManagementService.createRow(ownerUri).then(result => {
return result;
});
@@ -510,7 +510,7 @@ export default class QueryRunner extends Disposable {
return this._queryManagementService.deleteRow(ownerUri, rowId);
}
public revertCell(ownerUri: string, rowId: number, columnId: number): Thenable<sqlops.EditRevertCellResult> {
public revertCell(ownerUri: string, rowId: number, columnId: number): Thenable<azdata.EditRevertCellResult> {
return this._queryManagementService.revertCell(ownerUri, rowId, columnId).then(result => {
return result;
});
@@ -621,7 +621,7 @@ export default class QueryRunner extends Disposable {
private getColumnHeaders(batchId: number, resultId: number, range: Slick.Range): string[] {
let headers: string[] = undefined;
let batchSummary: sqlops.BatchSummary = this._batchSets[batchId];
let batchSummary: azdata.BatchSummary = this._batchSets[batchId];
if (batchSummary !== undefined) {
let resultSetSummary = batchSummary.resultSetSummaries[resultId];
headers = resultSetSummary.columnInfo.slice(range.fromCell, range.toCell + 1).map((info, i) => {
@@ -648,7 +648,7 @@ export default class QueryRunner extends Disposable {
// get config copyRemoveNewLine option from vscode config
let showBatchTime: boolean = WorkbenchUtils.getSqlConfigValue<boolean>(this._configurationService, Constants.configShowBatchTime);
if (showBatchTime) {
let message: sqlops.IResultMessage = {
let message: azdata.IResultMessage = {
batchId: batchId,
message: nls.localize('elapsedBatchTime', 'Batch execution time: {0}', executionTime),
time: undefined,

6
src/sql/platform/restore/common/mssqlRestoreInfo.ts
View File

@@ -5,12 +5,12 @@
'use strict';
import * as sqlops from 'sqlops';
import * as azdata from 'azdata';
export class MssqlRestoreInfo implements sqlops.RestoreInfo {
export class MssqlRestoreInfo implements azdata.RestoreInfo {
options: { [name: string]: any };
taskExecutionMode: sqlops.TaskExecutionMode;
taskExecutionMode: azdata.TaskExecutionMode;
public constructor() {
this.options = {};

12
src/sql/platform/restore/common/restoreService.ts
View File

@@ -7,7 +7,7 @@
import { TPromise } from 'vs/base/common/winjs.base';
import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
import * as sqlops from 'sqlops';
import * as azdata from 'azdata';
import { IConnectionProfile } from 'sql/platform/connection/common/interfaces';
export { TaskExecutionMode } from 'sql/platform/backup/common/backupService';
@@ -21,27 +21,27 @@ export interface IRestoreService {
/**
* Register a disaster recovery provider
*/
registerProvider(providerId: string, provider: sqlops.RestoreProvider): void;
registerProvider(providerId: string, provider: azdata.RestoreProvider): void;
/**
* Restore a data source using a backup file or database
*/
restore(connectionUri: string, restoreInfo: sqlops.RestoreInfo): Thenable<sqlops.RestoreResponse>;
restore(connectionUri: string, restoreInfo: azdata.RestoreInfo): Thenable<azdata.RestoreResponse>;
/**
* Gets restore plan to do the restore operation on a database
*/
getRestorePlan(connectionUri: string, restoreInfo: sqlops.RestoreInfo): Thenable<sqlops.RestorePlanResponse>;
getRestorePlan(connectionUri: string, restoreInfo: azdata.RestoreInfo): Thenable<azdata.RestorePlanResponse>;
/**
* Gets restore config Info
*/
getRestoreConfigInfo(connectionUri: string): Thenable<sqlops.RestoreConfigInfo>;
getRestoreConfigInfo(connectionUri: string): Thenable<azdata.RestoreConfigInfo>;
/**
* Cancel restore plan
*/
cancelRestorePlan(connectionUri: string, restoreInfo: sqlops.RestoreInfo): Thenable<boolean>;
cancelRestorePlan(connectionUri: string, restoreInfo: azdata.RestoreInfo): Thenable<boolean>;
}
export const IRestoreDialogController = createDecorator<IRestoreDialogController>('restoreDialogService');

28
src/sql/platform/restore/common/restoreServiceImpl.ts
View File

@@ -9,7 +9,7 @@ import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
import * as types from 'vs/base/common/types';
import * as sqlops from 'sqlops';
import * as azdata from 'azdata';
import { ICapabilitiesService } from 'sql/platform/capabilities/common/capabilitiesService';
import { IRestoreService, IRestoreDialogController, TaskExecutionMode } from 'sql/platform/restore/common/restoreService';
@@ -31,7 +31,7 @@ import { IConnectionManagementService } from 'sql/platform/connection/common/con
export class RestoreService implements IRestoreService {
public _serviceBrand: any;
private _providers: { [handle: string]: sqlops.RestoreProvider; } = Object.create(null);
private _providers: { [handle: string]: azdata.RestoreProvider; } = Object.create(null);
constructor(
@IConnectionManagementService private _connectionService: IConnectionManagementService,
@@ -42,8 +42,8 @@ export class RestoreService implements IRestoreService {
/**
* Gets restore config Info
*/
getRestoreConfigInfo(connectionUri: string): Thenable<sqlops.RestoreConfigInfo> {
return new Promise<sqlops.RestoreConfigInfo>((resolve, reject) => {
getRestoreConfigInfo(connectionUri: string): Thenable<azdata.RestoreConfigInfo> {
return new Promise<azdata.RestoreConfigInfo>((resolve, reject) => {
let providerResult = this.getProvider(connectionUri);
if (providerResult) {
providerResult.provider.getRestoreConfigInfo(connectionUri).then(result => {
@@ -60,8 +60,8 @@ export class RestoreService implements IRestoreService {
/**
* Restore a data source using a backup file or database
*/
restore(connectionUri: string, restoreInfo: sqlops.RestoreInfo): Thenable<sqlops.RestoreResponse> {
return new Promise<sqlops.RestoreResponse>((resolve, reject) => {
restore(connectionUri: string, restoreInfo: azdata.RestoreInfo): Thenable<azdata.RestoreResponse> {
return new Promise<azdata.RestoreResponse>((resolve, reject) => {
let providerResult = this.getProvider(connectionUri);
if (providerResult) {
TelemetryUtils.addTelemetry(this._telemetryService, TelemetryKeys.RestoreRequested, { provider: providerResult.providerName });
@@ -76,7 +76,7 @@ export class RestoreService implements IRestoreService {
});
}
private getProvider(connectionUri: string): { provider: sqlops.RestoreProvider, providerName: string } {
private getProvider(connectionUri: string): { provider: azdata.RestoreProvider, providerName: string } {
let providerId: string = this._connectionService.getProviderIdFromUri(connectionUri);
if (providerId) {
return { provider: this._providers[providerId], providerName: providerId };
@@ -88,8 +88,8 @@ export class RestoreService implements IRestoreService {
/**
* Gets restore plan to do the restore operation on a database
*/
getRestorePlan(connectionUri: string, restoreInfo: sqlops.RestoreInfo): Thenable<sqlops.RestorePlanResponse> {
return new Promise<sqlops.RestorePlanResponse>((resolve, reject) => {
getRestorePlan(connectionUri: string, restoreInfo: azdata.RestoreInfo): Thenable<azdata.RestorePlanResponse> {
return new Promise<azdata.RestorePlanResponse>((resolve, reject) => {
let providerResult = this.getProvider(connectionUri);
if (providerResult) {
providerResult.provider.getRestorePlan(connectionUri, restoreInfo).then(result => {
@@ -107,7 +107,7 @@ export class RestoreService implements IRestoreService {
/**
* Cancels a restore plan
*/
cancelRestorePlan(connectionUri: string, restoreInfo: sqlops.RestoreInfo): Thenable<boolean> {
cancelRestorePlan(connectionUri: string, restoreInfo: azdata.RestoreInfo): Thenable<boolean> {
return new Promise<boolean>((resolve, reject) => {
let providerResult = this.getProvider(connectionUri);
if (providerResult) {
@@ -126,7 +126,7 @@ export class RestoreService implements IRestoreService {
/**
* Register a disaster recovery provider
*/
public registerProvider(providerId: string, provider: sqlops.RestoreProvider): void {
public registerProvider(providerId: string, provider: azdata.RestoreProvider): void {
this._providers[providerId] = provider;
}
}
@@ -233,7 +233,7 @@ export class RestoreDialogController implements IRestoreDialogController {
});
}
private setRestoreOption(overwriteTargetDatabase: boolean = false): sqlops.RestoreInfo {
private setRestoreOption(overwriteTargetDatabase: boolean = false): azdata.RestoreInfo {
let restoreInfo = undefined;
let providerId: string = this.getCurrentProviderId();
@@ -264,8 +264,8 @@ export class RestoreDialogController implements IRestoreDialogController {
return restoreInfo;
}
private getRestoreOption(): sqlops.ServiceOption[] {
let options: sqlops.ServiceOption[] = [];
private getRestoreOption(): azdata.ServiceOption[] {
let options: azdata.ServiceOption[] = [];
let providerId: string = this.getCurrentProviderId();
let providerCapabilities = this._capabilitiesService.getLegacyCapabilities(providerId);

22
src/sql/platform/scripting/common/scriptingService.ts
View File

@@ -9,7 +9,7 @@ import { IDisposable, dispose } from 'vs/base/common/lifecycle';
import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement';
import { ScriptOperation } from 'sql/workbench/common/taskUtilities';
import * as sqlops from 'sqlops';
import * as azdata from 'azdata';
import { error } from 'sql/base/common/log';
export const SERVICE_ID = 'scriptingService';
@@ -18,12 +18,12 @@ export const IScriptingService = createDecorator<IScriptingService>(SERVICE_ID);
export interface IScriptingService {
_serviceBrand: any;
script(connectionUri: string, metadata: sqlops.ObjectMetadata, operation: ScriptOperation, paramDetails: sqlops.ScriptingParamDetails): Thenable<sqlops.ScriptingResult>;
script(connectionUri: string, metadata: azdata.ObjectMetadata, operation: ScriptOperation, paramDetails: azdata.ScriptingParamDetails): Thenable<azdata.ScriptingResult>;
/**
* Register a scripting provider
*/
registerProvider(providerId: string, provider: sqlops.ScriptingProvider): void;
registerProvider(providerId: string, provider: azdata.ScriptingProvider): void;
/**
* Specifies whether a provider with a given ID has been registered or not
@@ -33,12 +33,12 @@ export interface IScriptingService {
/**
* Callback method for when scripting is complete
*/
onScriptingComplete(handle: number, scriptingCompleteResult: sqlops.ScriptingCompleteResult): void;
onScriptingComplete(handle: number, scriptingCompleteResult: azdata.ScriptingCompleteResult): void;
/**
* Returns the result for an operation if the operation failed
*/
getOperationFailedResult(operationId: string): sqlops.ScriptingCompleteResult;
getOperationFailedResult(operationId: string): azdata.ScriptingCompleteResult;
}
export class ScriptingService implements IScriptingService {
@@ -47,9 +47,9 @@ export class ScriptingService implements IScriptingService {
private disposables: IDisposable[] = [];
private _providers: { [handle: string]: sqlops.ScriptingProvider; } = Object.create(null);
private _providers: { [handle: string]: azdata.ScriptingProvider; } = Object.create(null);
private failedScriptingOperations: { [operationId: string]: sqlops.ScriptingCompleteResult } = {};
private failedScriptingOperations: { [operationId: string]: azdata.ScriptingCompleteResult } = {};
constructor( @IConnectionManagementService private _connectionService: IConnectionManagementService) { }
/**
@@ -59,7 +59,7 @@ export class ScriptingService implements IScriptingService {
* @param operation
* @param paramDetails
*/
public script(connectionUri: string, metadata: sqlops.ObjectMetadata, operation: ScriptOperation, paramDetails: sqlops.ScriptingParamDetails): Thenable<sqlops.ScriptingResult> {
public script(connectionUri: string, metadata: azdata.ObjectMetadata, operation: ScriptOperation, paramDetails: azdata.ScriptingParamDetails): Thenable<azdata.ScriptingResult> {
let providerId: string = this._connectionService.getProviderIdFromUri(connectionUri);
if (providerId) {
@@ -76,7 +76,7 @@ export class ScriptingService implements IScriptingService {
* @param handle
* @param scriptingCompleteResult
*/
public onScriptingComplete(handle: number, scriptingCompleteResult: sqlops.ScriptingCompleteResult): void {
public onScriptingComplete(handle: number, scriptingCompleteResult: azdata.ScriptingCompleteResult): void {
if (scriptingCompleteResult && scriptingCompleteResult.hasError && scriptingCompleteResult.errorMessage) {
error(`Scripting failed. error: ${scriptingCompleteResult.errorMessage}`);
if (scriptingCompleteResult.operationId) {
@@ -89,7 +89,7 @@ export class ScriptingService implements IScriptingService {
* Returns the result for an operation if the operation failed
* @param operationId Operation Id
*/
public getOperationFailedResult(operationId: string): sqlops.ScriptingCompleteResult {
public getOperationFailedResult(operationId: string): azdata.ScriptingCompleteResult {
if (operationId && operationId in this.failedScriptingOperations) {
return this.failedScriptingOperations[operationId];
} else {
@@ -100,7 +100,7 @@ export class ScriptingService implements IScriptingService {
/**
* Register a scripting provider
*/
public registerProvider(providerId: string, provider: sqlops.ScriptingProvider): void {
public registerProvider(providerId: string, provider: azdata.ScriptingProvider): void {
this._providers[providerId] = provider;
}

16
src/sql/platform/serialization/common/serializationService.ts
View File

@@ -9,12 +9,12 @@ import { IDisposable, dispose } from 'vs/base/common/lifecycle';
import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement';
import { ICapabilitiesService } from 'sql/platform/capabilities/common/capabilitiesService';
import * as sqlops from 'sqlops';
import * as azdata from 'azdata';
export const SERVICE_ID = 'serializationService';
export interface SerializationProviderEvents {
onSaveAs(saveFormat: string, savePath: string, results: string, appendToFile: boolean): Thenable<sqlops.SaveResultRequestResult>;
onSaveAs(saveFormat: string, savePath: string, results: string, appendToFile: boolean): Thenable<azdata.SaveResultRequestResult>;
}
export const ISerializationService = createDecorator<ISerializationService>(SERVICE_ID);
@@ -22,13 +22,13 @@ export const ISerializationService = createDecorator<ISerializationService>(SERV
export interface ISerializationService {
_serviceBrand: any;
saveAs(saveFormat: string, savePath: string, results: string, appendToFile: boolean): Thenable<sqlops.SaveResultRequestResult>;
saveAs(saveFormat: string, savePath: string, results: string, appendToFile: boolean): Thenable<azdata.SaveResultRequestResult>;
disabledSaveAs(): Thenable<sqlops.SaveResultRequestResult>;
disabledSaveAs(): Thenable<azdata.SaveResultRequestResult>;
addEventListener(handle: number, events: SerializationProviderEvents): IDisposable;
getSerializationFeatureMetadataProvider(ownerUri: string): sqlops.FeatureMetadataProvider;
getSerializationFeatureMetadataProvider(ownerUri: string): azdata.FeatureMetadataProvider;
}
export class SerializationService implements ISerializationService {
@@ -58,7 +58,7 @@ export class SerializationService implements ISerializationService {
};
}
public saveAs(saveFormat: string, savePath: string, results: string, appendToFile: boolean): Thenable<sqlops.SaveResultRequestResult> {
public saveAs(saveFormat: string, savePath: string, results: string, appendToFile: boolean): Thenable<azdata.SaveResultRequestResult> {
if (this._serverEvents === undefined || this._serverEvents[this._lastHandle] === undefined) {
return this.disabledSaveAs();
}
@@ -66,12 +66,12 @@ export class SerializationService implements ISerializationService {
return this._serverEvents[this._lastHandle].onSaveAs(saveFormat, savePath, results, appendToFile);
}
public disabledSaveAs(): Thenable<sqlops.SaveResultRequestResult> {
public disabledSaveAs(): Thenable<azdata.SaveResultRequestResult> {
return Promise.resolve({ messages: 'Saving results into different format disabled for this data provider.' });
}
public getSerializationFeatureMetadataProvider(ownerUri: string): sqlops.FeatureMetadataProvider {
public getSerializationFeatureMetadataProvider(ownerUri: string): azdata.FeatureMetadataProvider {
let providerId: string = this._connectionService.getProviderIdFromUri(ownerUri);
let providerCapabilities = this._capabilitiesService.getLegacyCapabilities(providerId);

26
src/sql/platform/taskHistory/common/taskService.ts
View File

@@ -4,7 +4,7 @@
*--------------------------------------------------------------------------------------------*/
'use strict';
import * as sqlops from 'sqlops';
import * as azdata from 'azdata';
import { TaskNode, TaskStatus, TaskExecutionMode } from 'sql/parts/taskHistory/common/taskNode';
import { IQueryEditorService } from 'sql/workbench/services/queryEditor/common/queryEditorService';
import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
@@ -27,20 +27,20 @@ export interface ITaskService {
handleTaskComplete(eventArgs: TaskStatusChangeArgs): void;
getAllTasks(): TaskNode;
getNumberOfInProgressTasks(): number;
onNewTaskCreated(handle: number, taskInfo: sqlops.TaskInfo);
createNewTask(taskInfo: sqlops.TaskInfo);
updateTask(taskProgressInfo: sqlops.TaskProgressInfo);
onTaskStatusChanged(handle: number, taskProgressInfo: sqlops.TaskProgressInfo);
onNewTaskCreated(handle: number, taskInfo: azdata.TaskInfo);
createNewTask(taskInfo: azdata.TaskInfo);
updateTask(taskProgressInfo: azdata.TaskProgressInfo);
onTaskStatusChanged(handle: number, taskProgressInfo: azdata.TaskProgressInfo);
cancelTask(providerId: string, taskId: string): Thenable<boolean>;
/**
* Register a ObjectExplorer provider
*/
registerProvider(providerId: string, provider: sqlops.TaskServicesProvider): void;
registerProvider(providerId: string, provider: azdata.TaskServicesProvider): void;
}
export interface TaskStatusChangeArgs {
taskId: string;
status: sqlops.TaskStatus;
status: azdata.TaskStatus;
message?: string;
script?: string;
}
@@ -50,7 +50,7 @@ export class TaskService implements ITaskService {
private _taskQueue: TaskNode;
private _onTaskComplete = new Emitter<TaskNode>();
private _onAddNewTask = new Emitter<TaskNode>();
private _providers: { [handle: string]: sqlops.TaskServicesProvider; } = Object.create(null);
private _providers: { [handle: string]: azdata.TaskServicesProvider; } = Object.create(null);
constructor(
@ILifecycleService lifecycleService: ILifecycleService,
@@ -69,15 +69,15 @@ export class TaskService implements ITaskService {
/**
* Register a ObjectExplorer provider
*/
public registerProvider(providerId: string, provider: sqlops.TaskServicesProvider): void {
public registerProvider(providerId: string, provider: azdata.TaskServicesProvider): void {
this._providers[providerId] = provider;
}
public onNewTaskCreated(handle: number, taskInfo: sqlops.TaskInfo) {
public onNewTaskCreated(handle: number, taskInfo: azdata.TaskInfo) {
this.createNewTask(taskInfo);
}
public createNewTask(taskInfo: sqlops.TaskInfo) {
public createNewTask(taskInfo: azdata.TaskInfo) {
let databaseName: string = taskInfo.databaseName;
let serverName: string = taskInfo.serverName;
if (taskInfo && taskInfo.connection) {
@@ -94,7 +94,7 @@ export class TaskService implements ITaskService {
this.handleNewTask(node);
}
public updateTask(taskProgressInfo: sqlops.TaskProgressInfo) {
public updateTask(taskProgressInfo: azdata.TaskProgressInfo) {
this.handleTaskComplete({
taskId: taskProgressInfo.taskId,
status: taskProgressInfo.status,
@@ -103,7 +103,7 @@ export class TaskService implements ITaskService {
});
}
public onTaskStatusChanged(handle: number, taskProgressInfo: sqlops.TaskProgressInfo) {
public onTaskStatusChanged(handle: number, taskProgressInfo: azdata.TaskProgressInfo) {
this.updateTask(taskProgressInfo);
}