diff --git a/extensions/azurecore/tsconfig.json b/extensions/azurecore/tsconfig.json index b341a65dab..f7addac327 100644 --- a/extensions/azurecore/tsconfig.json +++ b/extensions/azurecore/tsconfig.json @@ -14,7 +14,7 @@ "emitDecoratorMetadata": true, "experimentalDecorators": true, "moduleResolution": "node", - "declaration": true + "declaration": false }, "exclude": [ "node_modules" diff --git a/extensions/import/tsconfig.json b/extensions/import/tsconfig.json index e6baa6d40d..a696aa1763 100644 --- a/extensions/import/tsconfig.json +++ b/extensions/import/tsconfig.json @@ -11,7 +11,7 @@ "emitDecoratorMetadata": true, "experimentalDecorators": true, "moduleResolution": "node", - "declaration": true + "declaration": false }, "exclude": [ "node_modules" diff --git a/extensions/mssql/tsconfig.json b/extensions/mssql/tsconfig.json index e6baa6d40d..a696aa1763 100644 --- a/extensions/mssql/tsconfig.json +++ b/extensions/mssql/tsconfig.json @@ -11,7 +11,7 @@ "emitDecoratorMetadata": true, "experimentalDecorators": true, "moduleResolution": "node", - "declaration": true + "declaration": false }, "exclude": [ "node_modules" diff --git a/extensions/profiler/client/src/dialogs/profilerCreateSessionDialog.ts b/extensions/profiler/client/src/dialogs/profilerCreateSessionDialog.ts index 679adb59a0..32f389542e 100644 --- a/extensions/profiler/client/src/dialogs/profilerCreateSessionDialog.ts +++ b/extensions/profiler/client/src/dialogs/profilerCreateSessionDialog.ts @@ -106,7 +106,7 @@ export class CreateSessionDialog { private updateSessionName() { if (this.templatesBox.value) { - this.sessionNameBox.value = `ADS_${this.templatesBox.value.toString()}` + this.sessionNameBox.value = `ADS_${this.templatesBox.value.toString()}`; } } diff --git a/src/sql/base/browser/ui/breadcrumb/breadcrumb.component.ts b/src/sql/base/browser/ui/breadcrumb/breadcrumb.component.ts index 1a0bb797cf..819c8d75e2 100644 --- a/src/sql/base/browser/ui/breadcrumb/breadcrumb.component.ts +++ b/src/sql/base/browser/ui/breadcrumb/breadcrumb.component.ts @@ -8,7 +8,7 @@ import 'vs/css!./media/breadcrumb'; import { Component, Inject, forwardRef, OnInit, OnDestroy, ChangeDetectorRef } from '@angular/core'; import { Router } from '@angular/router'; -import { toDisposableSubscription } from 'sql/parts/common/rxjsUtils'; +import { toDisposableSubscription } from 'sql/base/node/rxjsUtils'; import { IBreadcrumbService, MenuItem } from './interfaces'; import { IDisposable } from 'vs/base/common/lifecycle'; diff --git a/src/sql/base/browser/ui/editableDropdown/editableDropdown.component.ts b/src/sql/base/browser/ui/editableDropdown/editableDropdown.component.ts index 76690be161..2dd8995d60 100644 --- a/src/sql/base/browser/ui/editableDropdown/editableDropdown.component.ts +++ b/src/sql/base/browser/ui/editableDropdown/editableDropdown.component.ts @@ -11,7 +11,7 @@ import { } from '@angular/core'; import { Dropdown, IDropdownOptions } from 'sql/base/browser/ui/editableDropdown/dropdown'; -import { AngularDisposable } from 'sql/base/common/lifecycle'; +import { AngularDisposable } from 'sql/base/node/lifecycle'; import { IContextViewService } from 'vs/platform/contextview/browser/contextView'; import { attachEditableDropdownStyler } from 'sql/common/theme/styler'; diff --git a/src/sql/base/browser/ui/inputBox/inputBox.component.ts b/src/sql/base/browser/ui/inputBox/inputBox.component.ts index 40f57cc079..4697b68663 100644 --- a/src/sql/base/browser/ui/inputBox/inputBox.component.ts +++ b/src/sql/base/browser/ui/inputBox/inputBox.component.ts @@ -11,7 +11,7 @@ import { } from '@angular/core'; import { InputBox as vsInputBox } from 'sql/base/browser/ui/inputBox/inputBox'; -import { AngularDisposable } from 'sql/base/common/lifecycle'; +import { AngularDisposable } from 'sql/base/node/lifecycle'; import { attachInputBoxStyler } from 'vs/platform/theme/common/styler'; import { IThemeService } from 'vs/platform/theme/common/themeService'; diff --git a/src/sql/base/browser/ui/panel/panel.component.ts b/src/sql/base/browser/ui/panel/panel.component.ts index 2d8baac45b..d59076a638 100644 --- a/src/sql/base/browser/ui/panel/panel.component.ts +++ b/src/sql/base/browser/ui/panel/panel.component.ts @@ -12,7 +12,7 @@ import './panelStyles'; import { TabComponent } from './tab.component'; import { ScrollableDirective } from 'sql/base/browser/ui/scrollable/scrollable.directive'; -import { subscriptionToDisposable } from 'sql/base/common/lifecycle'; +import { subscriptionToDisposable } from 'sql/base/node/lifecycle'; import { ActionBar } from 'vs/base/browser/ui/actionbar/actionbar'; import { Action } from 'vs/base/common/actions'; diff --git a/src/sql/base/browser/ui/scrollable/scrollable.directive.ts b/src/sql/base/browser/ui/scrollable/scrollable.directive.ts index a80aa91eb0..13d5775672 100644 --- a/src/sql/base/browser/ui/scrollable/scrollable.directive.ts +++ b/src/sql/base/browser/ui/scrollable/scrollable.directive.ts @@ -8,7 +8,7 @@ import { Directive, Inject, forwardRef, ElementRef, Input } from '@angular/core' import { ScrollableElement } from 'vs/base/browser/ui/scrollbar/scrollableElement'; import { ScrollbarVisibility } from 'vs/base/common/scrollable'; import { getContentHeight, addDisposableListener, EventType, getContentWidth } from 'vs/base/browser/dom'; -import { AngularDisposable } from 'sql/base/common/lifecycle'; +import { AngularDisposable } from 'sql/base/node/lifecycle'; @Directive({ selector: '[scrollable]' @@ -74,7 +74,7 @@ export class ScrollableDirective extends AngularDisposable { private resetScrollDimensions() { this.scrollableElement.setScrollDimensions({ scrollHeight: this.verticalScroll === ScrollbarVisibility.Auto ? getContentHeight(this.scrolled) : undefined, - height: this.verticalScroll === ScrollbarVisibility.Auto ? getContentHeight(this.parent) : undefined, + height: this.verticalScroll === ScrollbarVisibility.Auto ? getContentHeight(this.parent) : undefined, scrollWidth: this.horizontalScroll === ScrollbarVisibility.Auto ? this.scrolled.scrollWidth : undefined, width: this.horizontalScroll === ScrollbarVisibility.Auto ? this.scrolled.offsetWidth : undefined }); diff --git a/src/sql/base/browser/ui/selectBox/selectBox.component.ts b/src/sql/base/browser/ui/selectBox/selectBox.component.ts index 04b6e82e4b..a1c6084023 100644 --- a/src/sql/base/browser/ui/selectBox/selectBox.component.ts +++ b/src/sql/base/browser/ui/selectBox/selectBox.component.ts @@ -11,7 +11,7 @@ import { } from '@angular/core'; import { SelectBox as vsSelectBox } from 'sql/base/browser/ui/selectBox/selectBox'; -import { AngularDisposable } from 'sql/base/common/lifecycle'; +import { AngularDisposable } from 'sql/base/node/lifecycle'; import { IContextViewService } from 'vs/platform/contextview/browser/contextView'; import { ISelectData } from 'vs/base/browser/ui/selectBox/selectBox'; diff --git a/src/sql/base/browser/ui/table/plugins/rowDetailView.ts b/src/sql/base/browser/ui/table/plugins/rowDetailView.ts index a1c5bfd3c2..7634e9a88c 100644 --- a/src/sql/base/browser/ui/table/plugins/rowDetailView.ts +++ b/src/sql/base/browser/ui/table/plugins/rowDetailView.ts @@ -219,7 +219,7 @@ export class RowDetailView { public subscribeToOnAsyncResponse() { this.onAsyncResponse.subscribe((e, args) => { if (!args || !args.itemDetail) { - throw 'Slick.RowDetailView plugin requires the onAsyncResponse() to supply "args.itemDetail" property.'; + throw new Error('Slick.RowDetailView plugin requires the onAsyncResponse() to supply "args.itemDetail" property.'); } // If we just want to load in a view directly we can use detailView property to do so @@ -278,7 +278,7 @@ export class RowDetailView { item._isPadding = false; item._parent = parent; item._offset = offset; - item.name = parent.message ? parent.message : nls.localize('rowDetailView.loadError','Loading Error...'); + item.name = parent.message ? parent.message : nls.localize('rowDetailView.loadError', 'Loading Error...'); parent._child = item; return item; } @@ -349,15 +349,13 @@ export class RowDetailView { //slick-cell to escape the cell overflow clipping. //sneaky extra inserted here-----------------v - /* tslint:disable:no-unexternalized-strings */ - html.push("
"); + html.push('
'); - html.push("
"); //shift detail below 1st row - html.push("
"); //sub ctr for custom styling - html.push("
", escape(dataContext._detailContent), "
"); - /* tslint:enable:no-unexternalized-strings */ + html.push(`
`); //shift detail below 1st row + html.push(`
`); //sub ctr for custom styling + html.push(`
${escape(dataContext._detailContent)}
`); //&omit a final closing detail container
that would come next return html.join(''); @@ -401,9 +399,9 @@ export class RowDetailView { this._grid.getOptions().minRowBuffer = item._sizePadding + 3; } - mainContainer.setAttribute('style', 'max-height: ' + item._height + 'px'); + mainContainer.setAttribute('style', `max-height: ${item._height}px`); if (cellItem) { - cellItem.setAttribute('style', 'height: ' + item._height + 'px;top:' + rowHeight + 'px'); + cellItem.setAttribute('style', `height: ${item._height}px;top:${rowHeight}px`); } let idxParent = this._dataView.getIdxById(item.id); diff --git a/src/sql/base/common/lifecycle.ts b/src/sql/base/node/lifecycle.ts similarity index 100% rename from src/sql/base/common/lifecycle.ts rename to src/sql/base/node/lifecycle.ts diff --git a/src/sql/parts/common/rxjsUtils.ts b/src/sql/base/node/rxjsUtils.ts similarity index 100% rename from src/sql/parts/common/rxjsUtils.ts rename to src/sql/base/node/rxjsUtils.ts diff --git a/src/sql/common/urlSerializer.ts b/src/sql/base/node/urlSerializer.ts similarity index 59% rename from src/sql/common/urlSerializer.ts rename to src/sql/base/node/urlSerializer.ts index 25fd338787..32cbfb0761 100644 --- a/src/sql/common/urlSerializer.ts +++ b/src/sql/base/node/urlSerializer.ts @@ -11,17 +11,17 @@ import { DefaultUrlSerializer, UrlSerializer, UrlTree } from '@angular/router'; * encode and decode the parentheses. Github issue angular/angular#10280, microsoft/carbon#1116 */ export default class CustomUrlSerializer implements UrlSerializer { - private _defaultUrlSerializer: DefaultUrlSerializer = new DefaultUrlSerializer(); + private _defaultUrlSerializer: DefaultUrlSerializer = new DefaultUrlSerializer(); - parse(url: string): UrlTree { - // Encode parentheses - url = url.replace(/\(/g, '%28').replace(/\)/g, '%29'); - // Use the default serializer from here on - return this._defaultUrlSerializer.parse(url); - } + parse(url: string): UrlTree { + // Encode parentheses + url = url.replace(/\(/g, '%28').replace(/\)/g, '%29'); + // Use the default serializer from here on + return this._defaultUrlSerializer.parse(url); + } - serialize(tree: UrlTree): string { - // serialize parentheses after angular router - return this._defaultUrlSerializer.serialize(tree).replace(/%28/g, '(').replace(/%29/g, ')'); - } + serialize(tree: UrlTree): string { + // serialize parentheses after angular router + return this._defaultUrlSerializer.serialize(tree).replace(/%28/g, '(').replace(/%29/g, ')'); + } } diff --git a/src/sql/common/constants.ts b/src/sql/common/constants.ts index 96428e4b07..6e597deefb 100644 --- a/src/sql/common/constants.ts +++ b/src/sql/common/constants.ts @@ -6,7 +6,6 @@ // localizable strings export const InvalidProvider = 'Provider is invalid'; -export const SerializationDisabled = 'Saving results into different format disabled for this data provider.'; /** * Feature names diff --git a/src/sql/common/telemetryUtilities.ts b/src/sql/common/telemetryUtilities.ts index cabc0d2d19..7812026220 100644 --- a/src/sql/common/telemetryUtilities.ts +++ b/src/sql/common/telemetryUtilities.ts @@ -5,7 +5,7 @@ 'use strict'; import { ITelemetryService, ITelemetryData } from 'vs/platform/telemetry/common/telemetry'; -import { IConnectionProfile } from 'sql/parts/connection/common/interfaces'; +import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; import { warn } from 'sql/base/common/log'; export interface IConnectionTelemetryData extends ITelemetryData { diff --git a/src/sql/parts/accountManagement/accountDialog/accountDialog.ts b/src/sql/parts/accountManagement/accountDialog/accountDialog.ts index 1f4e4bd789..b790fa76e4 100644 --- a/src/sql/parts/accountManagement/accountDialog/accountDialog.ts +++ b/src/sql/parts/accountManagement/accountDialog/accountDialog.ts @@ -33,7 +33,7 @@ import { attachModalDialogStyler, attachButtonStyler, attachPanelStyler } from ' import { AccountViewModel } from 'sql/parts/accountManagement/accountDialog/accountViewModel'; import { AddAccountAction } from 'sql/parts/accountManagement/common/accountActions'; import { AccountListRenderer, AccountListDelegate } from 'sql/parts/accountManagement/common/accountListRenderer'; -import { AccountProviderAddedEventParams, UpdateAccountListEventParams } from 'sql/services/accountManagement/eventTypes'; +import { AccountProviderAddedEventParams, UpdateAccountListEventParams } from 'sql/platform/accountManagement/common/eventTypes'; import { IClipboardService } from 'sql/platform/clipboard/common/clipboardService'; import * as TelemetryKeys from 'sql/common/telemetryKeys'; diff --git a/src/sql/parts/accountManagement/accountDialog/accountDialogController.ts b/src/sql/parts/accountManagement/accountDialog/accountDialogController.ts index 38fa335760..41211542f4 100644 --- a/src/sql/parts/accountManagement/accountDialog/accountDialogController.ts +++ b/src/sql/parts/accountManagement/accountDialog/accountDialogController.ts @@ -7,9 +7,9 @@ import Severity from 'vs/base/common/severity'; import { AccountDialog } from 'sql/parts/accountManagement/accountDialog/accountDialog'; -import { IErrorMessageService } from 'sql/parts/connection/common/connectionManagement'; import { localize } from 'vs/nls'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; +import { IErrorMessageService } from 'sql/platform/errorMessage/common/errorMessageService'; export class AccountDialogController { diff --git a/src/sql/parts/accountManagement/accountDialog/accountViewModel.ts b/src/sql/parts/accountManagement/accountDialog/accountViewModel.ts index 9154ff830d..c5c7b25df7 100644 --- a/src/sql/parts/accountManagement/accountDialog/accountViewModel.ts +++ b/src/sql/parts/accountManagement/accountDialog/accountViewModel.ts @@ -7,8 +7,8 @@ import * as sqlops from 'sqlops'; import { Event, Emitter } from 'vs/base/common/event'; -import { IAccountManagementService } from 'sql/services/accountManagement/interfaces'; -import { AccountProviderAddedEventParams, UpdateAccountListEventParams } from 'sql/services/accountManagement/eventTypes'; +import { IAccountManagementService } from 'sql/platform/accountManagement/common/interfaces'; +import { AccountProviderAddedEventParams, UpdateAccountListEventParams } from 'sql/platform/accountManagement/common/eventTypes'; /** * View model for account dialog diff --git a/src/sql/parts/accountManagement/accountListStatusbar/accountListStatusbarItem.ts b/src/sql/parts/accountManagement/accountListStatusbar/accountListStatusbarItem.ts index 0ddd786be8..f0f52664ce 100644 --- a/src/sql/parts/accountManagement/accountListStatusbar/accountListStatusbarItem.ts +++ b/src/sql/parts/accountManagement/accountListStatusbar/accountListStatusbarItem.ts @@ -17,7 +17,7 @@ import { IStatusbarItem } from 'vs/workbench/browser/parts/statusbar/statusbar'; import { Themable, STATUS_BAR_FOREGROUND } from 'vs/workbench/common/theme'; import { IThemeService } from 'vs/platform/theme/common/themeService'; -import { IAccountManagementService } from 'sql/services/accountManagement/interfaces'; +import { IAccountManagementService } from 'sql/platform/accountManagement/common/interfaces'; export class AccountListStatusbarItem extends Themable implements IStatusbarItem { private _manageLinkedAccountAction: IAction; diff --git a/src/sql/parts/accountManagement/autoOAuthDialog/autoOAuthDialogController.ts b/src/sql/parts/accountManagement/autoOAuthDialog/autoOAuthDialogController.ts index 07d979f090..35cccc629b 100644 --- a/src/sql/parts/accountManagement/autoOAuthDialog/autoOAuthDialogController.ts +++ b/src/sql/parts/accountManagement/autoOAuthDialog/autoOAuthDialogController.ts @@ -8,9 +8,9 @@ import { IInstantiationService } from 'vs/platform/instantiation/common/instanti import Severity from 'vs/base/common/severity'; import { localize } from 'vs/nls'; -import { IErrorMessageService } from 'sql/parts/connection/common/connectionManagement'; import { AutoOAuthDialog } from 'sql/parts/accountManagement/autoOAuthDialog/autoOAuthDialog'; -import { IAccountManagementService } from 'sql/services/accountManagement/interfaces'; +import { IAccountManagementService } from 'sql/platform/accountManagement/common/interfaces'; +import { IErrorMessageService } from 'sql/platform/errorMessage/common/errorMessageService'; export class AutoOAuthDialogController { // MEMBER VARIABLES //////////////////////////////////////////////////// diff --git a/src/sql/parts/accountManagement/common/accountActions.ts b/src/sql/parts/accountManagement/common/accountActions.ts index b35b980d58..1fb6a9d987 100644 --- a/src/sql/parts/accountManagement/common/accountActions.ts +++ b/src/sql/parts/accountManagement/common/accountActions.ts @@ -12,8 +12,7 @@ import { TPromise } from 'vs/base/common/winjs.base'; import { Action } from 'vs/base/common/actions'; import { error } from 'sql/base/common/log'; -import { IAccountManagementService } from 'sql/services/accountManagement/interfaces'; -import { IErrorMessageService } from 'sql/parts/connection/common/connectionManagement'; +import { IAccountManagementService } from 'sql/platform/accountManagement/common/interfaces'; import { IDialogService, IConfirmation } from 'vs/platform/dialogs/common/dialogs'; import { INotificationService } from 'vs/platform/notification/common/notification'; import Severity from 'vs/base/common/severity'; @@ -83,7 +82,6 @@ export class RemoveAccountAction extends Action { private _account: sqlops.Account, @IDialogService private _dialogService: IDialogService, @INotificationService private _notificationService: INotificationService, - @IErrorMessageService private _errorMessageService: IErrorMessageService, @IAccountManagementService private _accountManagementService: IAccountManagementService ) { super(RemoveAccountAction.ID, RemoveAccountAction.LABEL, 'remove-account-action icon remove'); @@ -107,15 +105,15 @@ export class RemoveAccountAction extends Action { return new TPromise((resolve, reject) => { self._accountManagementService.removeAccount(self._account.key) .then( - (result) => { resolve(result); }, - (err) => { - // Must handle here as this is an independent action - self._notificationService.notify({ - severity: Severity.Error, - message: localize('removeAccountFailed', 'Failed to remove account') - }); - resolve(false); - } + (result) => { resolve(result); }, + (err) => { + // Must handle here as this is an independent action + self._notificationService.notify({ + severity: Severity.Error, + message: localize('removeAccountFailed', 'Failed to remove account') + }); + resolve(false); + } ); }); } diff --git a/src/sql/parts/accountManagement/firewallRuleDialog/firewallRuleDialog.ts b/src/sql/parts/accountManagement/firewallRuleDialog/firewallRuleDialog.ts index 83dd12137d..80938a713e 100644 --- a/src/sql/parts/accountManagement/firewallRuleDialog/firewallRuleDialog.ts +++ b/src/sql/parts/accountManagement/firewallRuleDialog/firewallRuleDialog.ts @@ -13,13 +13,14 @@ import { Event, Emitter } from 'vs/base/common/event'; import { IContextViewService } from 'vs/platform/contextview/browser/contextView'; import { localize } from 'vs/nls'; import { buttonBackground } from 'vs/platform/theme/common/colorRegistry'; -import { IWorkbenchThemeService, IColorTheme } from 'vs/workbench/services/themes/common/workbenchThemeService'; import { attachInputBoxStyler } from 'vs/platform/theme/common/styler'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry'; import { SIDE_BAR_BACKGROUND } from 'vs/workbench/common/theme'; import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey'; import { IWindowsService } from 'vs/platform/windows/common/windows'; +import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService'; +import { IThemeService, ITheme } from 'vs/platform/theme/common/themeService'; import * as sqlops from 'sqlops'; import { Button } from 'sql/base/browser/ui/button/button'; @@ -27,9 +28,8 @@ import { Modal } from 'sql/base/browser/ui/modal/modal'; import { FirewallRuleViewModel } from 'sql/parts/accountManagement/firewallRuleDialog/firewallRuleViewModel'; import { attachModalDialogStyler, attachButtonStyler } from 'sql/common/theme/styler'; import { InputBox } from 'sql/base/browser/ui/inputBox/inputBox'; -import { IAccountPickerService } from 'sql/parts/accountManagement/common/interfaces'; +import { IAccountPickerService } from 'sql/platform/accountManagement/common/accountPicker'; import * as TelemetryKeys from 'sql/common/telemetryKeys'; -import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService'; // TODO: Make the help link 1) extensible (01/08/2018, https://github.com/Microsoft/azuredatastudio/issues/450) // in case that other non-Azure sign in is to be used @@ -65,7 +65,7 @@ export class FirewallRuleDialog extends Modal { constructor( @IAccountPickerService private _accountPickerService: IAccountPickerService, @IPartService partService: IPartService, - @IWorkbenchThemeService private _workbenchThemeService: IWorkbenchThemeService, + @IThemeService themeService: IThemeService, @IInstantiationService private _instantiationService: IInstantiationService, @IContextViewService private _contextViewService: IContextViewService, @ITelemetryService telemetryService: ITelemetryService, @@ -79,7 +79,7 @@ export class FirewallRuleDialog extends Modal { partService, telemetryService, clipboardService, - _workbenchThemeService, + themeService, contextKeyService, { isFlyout: true, @@ -206,8 +206,8 @@ export class FirewallRuleDialog extends Modal { builder.append(firewallRuleSection); }); - this._register(this._workbenchThemeService.onDidColorThemeChange(e => this.updateTheme(e))); - this.updateTheme(this._workbenchThemeService.getColorTheme()); + this._register(this._themeService.onThemeChange(e => this.updateTheme(e))); + this.updateTheme(this._themeService.getTheme()); $(this._IPAddressInput).on(DOM.EventType.CLICK, () => { this.onFirewallRuleOptionSelected(true); @@ -243,7 +243,7 @@ export class FirewallRuleDialog extends Modal { } // Update theming that is specific to firewall rule flyout body - private updateTheme(theme: IColorTheme): void { + private updateTheme(theme: ITheme): void { let linkColor = theme.getColor(buttonBackground); let link = linkColor ? linkColor.toString() : null; if (this._helpLink) { diff --git a/src/sql/parts/accountManagement/firewallRuleDialog/firewallRuleDialogController.ts b/src/sql/parts/accountManagement/firewallRuleDialog/firewallRuleDialogController.ts index 642a13bcb1..d431f2879c 100644 --- a/src/sql/parts/accountManagement/firewallRuleDialog/firewallRuleDialogController.ts +++ b/src/sql/parts/accountManagement/firewallRuleDialog/firewallRuleDialogController.ts @@ -9,12 +9,12 @@ import Severity from 'vs/base/common/severity'; import { localize } from 'vs/nls'; import * as sqlops from 'sqlops'; -import { IConnectionProfile } from 'sql/parts/connection/common/interfaces'; -import { IErrorMessageService } from 'sql/parts/connection/common/connectionManagement'; +import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; import { FirewallRuleDialog } from 'sql/parts/accountManagement/firewallRuleDialog/firewallRuleDialog'; -import { IAccountManagementService, AzureResource } from 'sql/services/accountManagement/interfaces'; -import { IResourceProviderService } from 'sql/parts/accountManagement/common/interfaces'; +import { IAccountManagementService, AzureResource } from 'sql/platform/accountManagement/common/interfaces'; +import { IResourceProviderService } from 'sql/workbench/services/resourceProvider/common/resourceProviderService'; import { Deferred } from 'sql/base/common/promise'; +import { IErrorMessageService } from 'sql/platform/errorMessage/common/errorMessageService'; export class FirewallRuleDialogController { diff --git a/src/sql/parts/admin/database/create/createDatabase.component.ts b/src/sql/parts/admin/database/create/createDatabase.component.ts index 7708303c06..728c15ac37 100644 --- a/src/sql/parts/admin/database/create/createDatabase.component.ts +++ b/src/sql/parts/admin/database/create/createDatabase.component.ts @@ -7,8 +7,8 @@ import { ChangeDetectorRef, ElementRef, Component, forwardRef, Inject } from '@a import { NgForm } from '@angular/forms'; import { ITaskDialogComponentParams } from 'sql/services/bootstrap/bootstrapParams'; -import { ConnectionManagementInfo } from 'sql/parts/connection/common/connectionManagementInfo'; -import { IAdminService } from 'sql/parts/admin/common/adminService'; +import { ConnectionManagementInfo } from 'sql/platform/connection/common/connectionManagementInfo'; +import { IAdminService } from 'sql/workbench/services/admin/common/adminService'; import { ITaskDialogComponent } from 'sql/parts/tasks/common/tasks'; import * as sqlops from 'sqlops'; diff --git a/src/sql/parts/admin/security/createLogin.component.ts b/src/sql/parts/admin/security/createLogin.component.ts index 8e1d8cfa08..f876048fe5 100644 --- a/src/sql/parts/admin/security/createLogin.component.ts +++ b/src/sql/parts/admin/security/createLogin.component.ts @@ -6,7 +6,7 @@ import { ElementRef, Component, Inject, forwardRef } from '@angular/core'; import { IBootstrapParams } from 'sql/services/bootstrap/bootstrapService'; import { IDashboardComponentParams } from 'sql/services/bootstrap/bootstrapParams'; -import { ConnectionManagementInfo } from 'sql/parts/connection/common/connectionManagementInfo'; +import { ConnectionManagementInfo } from 'sql/platform/connection/common/connectionManagementInfo'; export const CREATELOGIN_SELECTOR: string = 'createlogin-component'; @@ -21,8 +21,8 @@ export class CreateLoginComponent { public connection: ConnectionManagementInfo; constructor( - @Inject(forwardRef(() => ElementRef)) private _el: ElementRef, - @Inject(IBootstrapParams) private _params: IDashboardComponentParams + @Inject(forwardRef(() => ElementRef)) private _el: ElementRef, + @Inject(IBootstrapParams) private _params: IDashboardComponentParams ) { } } diff --git a/src/sql/parts/admin/security/createLoginEditor.ts b/src/sql/parts/admin/security/createLoginEditor.ts index 0152fc14ec..c7a7cdc58b 100644 --- a/src/sql/parts/admin/security/createLoginEditor.ts +++ b/src/sql/parts/admin/security/createLoginEditor.ts @@ -11,11 +11,11 @@ import { BaseEditor } from 'vs/workbench/browser/parts/editor/baseEditor'; import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry'; import { IThemeService } from 'vs/platform/theme/common/themeService'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; -import { CreateLoginInput } from './createLoginInput'; -import { CreateLoginModule } from './createLogin.module'; -import { IConnectionManagementService } from 'sql/parts/connection/common/connectionManagement'; -import { IMetadataService } from 'sql/services/metadata/metadataService'; -import { IScriptingService } from 'sql/services/scripting/scriptingService'; +import { CreateLoginInput } from 'sql/parts/admin/security/createLoginInput'; +import { CreateLoginModule } from 'sql/parts/admin/security/createLogin.module'; +import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement'; +import { IMetadataService } from 'sql/platform/metadata/common/metadataService'; +import { IScriptingService } from 'sql/platform/scripting/common/scriptingService'; import { IQueryEditorService } from 'sql/parts/query/common/queryEditorService'; import { bootstrapAngular, IBootstrapParams } from 'sql/services/bootstrap/bootstrapService'; import { CREATELOGIN_SELECTOR } from 'sql/parts/admin/security/createLogin.component'; diff --git a/src/sql/parts/admin/security/createLoginInput.ts b/src/sql/parts/admin/security/createLoginInput.ts index 6ca44e7287..7d6c6c470b 100644 --- a/src/sql/parts/admin/security/createLoginInput.ts +++ b/src/sql/parts/admin/security/createLoginInput.ts @@ -6,7 +6,7 @@ import { TPromise } from 'vs/base/common/winjs.base'; import { EditorInput, EditorModel } from 'vs/workbench/common/editor'; import { UntitledEditorInput } from 'vs/workbench/common/editor/untitledEditorInput'; -import { IConnectionProfile } from 'sql/parts/connection/common/interfaces'; +import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; export class CreateLoginInput extends EditorInput { diff --git a/src/sql/parts/common/customInputConverter.ts b/src/sql/parts/common/customInputConverter.ts index 0942d08ae4..22e88a1b00 100644 --- a/src/sql/parts/common/customInputConverter.ts +++ b/src/sql/parts/common/customInputConverter.ts @@ -3,8 +3,6 @@ * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import * as path from 'path'; - import { EditorInput, IEditorInput } from 'vs/workbench/common/editor'; import { IInstantiationService, ServiceIdentifier } from 'vs/platform/instantiation/common/instantiation'; import { UntitledEditorInput } from 'vs/workbench/common/editor/untitledEditorInput'; @@ -16,7 +14,7 @@ import { QueryInput } from 'sql/parts/query/common/queryInput'; import { IQueryEditorOptions } from 'sql/parts/query/common/queryEditorService'; import { QueryPlanInput } from 'sql/parts/queryPlan/queryPlanInput'; import { NotebookInput, NotebookInputModel, NotebookInputValidator } from 'sql/parts/notebook/notebookInput'; -import { DEFAULT_NOTEBOOK_PROVIDER, INotebookService } from 'sql/services/notebook/notebookService'; +import { DEFAULT_NOTEBOOK_PROVIDER, INotebookService } from 'sql/workbench/services/notebook/common/notebookService'; import { getProvidersForFileName } from 'sql/parts/notebook/notebookUtils'; import { ResourceEditorInput } from 'vs/workbench/common/editor/resourceEditorInput'; diff --git a/src/sql/parts/connection/common/connectionActions.ts b/src/sql/parts/connection/common/connectionActions.ts index 656e924b6b..73871c324d 100644 --- a/src/sql/parts/connection/common/connectionActions.ts +++ b/src/sql/parts/connection/common/connectionActions.ts @@ -8,8 +8,8 @@ import { Action } from 'vs/base/common/actions'; import { TPromise } from 'vs/base/common/winjs.base'; import { Event, Emitter } from 'vs/base/common/event'; import { IQuickOpenService } from 'vs/platform/quickOpen/common/quickOpen'; -import { IConnectionProfile } from 'sql/parts/connection/common/interfaces'; -import { IConnectionManagementService } from 'sql/parts/connection/common/connectionManagement'; +import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; +import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement'; import { INotificationService, INotificationActions } from 'vs/platform/notification/common/notification'; import Severity from 'vs/base/common/severity'; import { IDialogService, IConfirmation, IConfirmationResult } from 'vs/platform/dialogs/common/dialogs'; @@ -159,7 +159,7 @@ export class GetCurrentConnectionStringAction extends Action { return new TPromise((resolve, reject) => { let activeInput = this._editorService.activeEditor; if (activeInput && (activeInput instanceof QueryInput || activeInput instanceof EditDataInput || activeInput instanceof DashboardInput) - && this._connectionManagementService.isConnected(activeInput.uri)) { + && this._connectionManagementService.isConnected(activeInput.uri)) { let includePassword = false; let connectionProfile = this._connectionManagementService.getConnectionProfile(activeInput.uri); this._connectionManagementService.getConnectionString(connectionProfile.id, includePassword).then(result => { diff --git a/src/sql/parts/connection/common/connectionStatus.ts b/src/sql/parts/connection/common/connectionStatus.ts index 12c5b2e066..dbe8b80bcf 100644 --- a/src/sql/parts/connection/common/connectionStatus.ts +++ b/src/sql/parts/connection/common/connectionStatus.ts @@ -7,9 +7,9 @@ import { IDisposable, combinedDisposable } from 'vs/base/common/lifecycle'; import { IStatusbarItem } from 'vs/workbench/browser/parts/statusbar/statusbar'; import { IEditorService } from 'vs/workbench/services/editor/common/editorService'; import { IEditorGroupsService } from 'vs/workbench/services/group/common/editorGroupsService'; -import { IConnectionManagementService } from 'sql/parts/connection/common/connectionManagement'; -import { ICapabilitiesService } from 'sql/services/capabilities/capabilitiesService'; -import { IConnectionProfile } from 'sql/parts/connection/common/interfaces'; +import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement'; +import { ICapabilitiesService } from 'sql/platform/capabilities/common/capabilitiesService'; +import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; import { IObjectExplorerService } from 'sql/parts/objectExplorer/common/objectExplorerService'; import * as TaskUtilities from 'sql/workbench/common/taskUtilities'; import { EditorServiceImpl } from 'vs/workbench/browser/parts/editor/editor'; diff --git a/src/sql/parts/connection/connectionDialog/connectionController.ts b/src/sql/parts/connection/connectionDialog/connectionController.ts index da4be5828d..16be0873ee 100644 --- a/src/sql/parts/connection/connectionDialog/connectionController.ts +++ b/src/sql/parts/connection/connectionDialog/connectionController.ts @@ -5,15 +5,15 @@ 'use strict'; -import { IConnectionManagementService } from 'sql/parts/connection/common/connectionManagement'; +import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement'; import { IConnectionComponentCallbacks, IConnectionComponentController, IConnectionValidateResult } from 'sql/parts/connection/connectionDialog/connectionDialogService'; import { ConnectionWidget } from 'sql/parts/connection/connectionDialog/connectionWidget'; import { AdvancedPropertiesController } from 'sql/parts/connection/connectionDialog/advancedPropertiesController'; -import { IConnectionProfile } from 'sql/parts/connection/common/interfaces'; -import { ConnectionProfileGroup, IConnectionProfileGroup } from 'sql/parts/connection/common/connectionProfileGroup'; -import * as Constants from 'sql/parts/connection/common/constants'; +import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; +import { ConnectionProfileGroup, IConnectionProfileGroup } from 'sql/platform/connection/common/connectionProfileGroup'; +import * as Constants from 'sql/platform/connection/common/constants'; import * as sqlops from 'sqlops'; -import * as Utils from 'sql/parts/connection/common/utils'; +import * as Utils from 'sql/platform/connection/common/utils'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; import { ConnectionOptionSpecialType } from 'sql/workbench/api/common/sqlExtHostTypes'; import { ConnectionProviderProperties } from 'sql/workbench/parts/connection/common/connectionProviderExtension'; diff --git a/src/sql/parts/connection/connectionDialog/connectionDialogService.ts b/src/sql/parts/connection/connectionDialog/connectionDialogService.ts index b16c3667a3..f10475ae2f 100644 --- a/src/sql/parts/connection/connectionDialog/connectionDialogService.ts +++ b/src/sql/parts/connection/connectionDialog/connectionDialogService.ts @@ -6,20 +6,19 @@ 'use strict'; import { - IConnectionDialogService, IConnectionManagementService, IErrorMessageService, + IConnectionDialogService, IConnectionManagementService, ConnectionType, INewConnectionParams, IConnectionCompletionOptions, IConnectionResult -} from 'sql/parts/connection/common/connectionManagement'; +} from 'sql/platform/connection/common/connectionManagement'; import { ConnectionDialogWidget, OnShowUIResponse } from 'sql/parts/connection/connectionDialog/connectionDialogWidget'; import { ConnectionController } from 'sql/parts/connection/connectionDialog/connectionController'; import * as WorkbenchUtils from 'sql/workbench/common/sqlWorkbenchUtils'; -import * as Constants from 'sql/parts/connection/common/constants'; -import { IConnectionProfile } from 'sql/parts/connection/common/interfaces'; -import { ICapabilitiesService } from 'sql/services/capabilities/capabilitiesService'; -import { ConnectionProfile } from 'sql/parts/connection/common/connectionProfile'; -import { localize } from 'vs/nls'; +import * as Constants from 'sql/platform/connection/common/constants'; +import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; +import { ICapabilitiesService } from 'sql/platform/capabilities/common/capabilitiesService'; +import { ConnectionProfile } from 'sql/platform/connection/common/connectionProfile'; import { entries } from 'sql/base/common/objects'; - -import * as sqlops from 'sqlops'; +import { Deferred } from 'sql/base/common/promise'; +import { IErrorMessageService } from 'sql/platform/errorMessage/common/errorMessageService'; import { IPartService } from 'vs/workbench/services/part/common/partService'; import { TPromise } from 'vs/base/common/winjs.base'; @@ -28,12 +27,11 @@ import * as platform from 'vs/base/common/platform'; import Severity from 'vs/base/common/severity'; import { IWorkspaceConfigurationService } from 'vs/workbench/services/configuration/common/configuration'; import { Action, IAction } from 'vs/base/common/actions'; -import { IWindowsService } from 'vs/platform/windows/common/windows'; import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService'; import { ICommandService } from 'vs/platform/commands/common/commands'; import * as types from 'vs/base/common/types'; import { trim } from 'vs/base/common/strings'; -import { Deferred } from 'sql/base/common/promise'; +import { localize } from 'vs/nls'; export interface IConnectionValidateResult { isValid: boolean; @@ -87,14 +85,14 @@ export class ConnectionDialogService implements IConnectionDialogService { @IClipboardService private _clipboardService: IClipboardService, @ICommandService private _commandService: ICommandService ) { } -/** - * Gets the default provider with the following actions - * 1. Checks if master provider(map) has data - * 2. If so, filters provider paramter against master map - * 3. Fetches the result array and extracts the first element - * 4. If none of the above data exists, returns 'MSSQL' - * @returns: Default provider as string - */ + /** + * Gets the default provider with the following actions + * 1. Checks if master provider(map) has data + * 2. If so, filters provider paramter against master map + * 3. Fetches the result array and extracts the first element + * 4. If none of the above data exists, returns 'MSSQL' + * @returns: Default provider as string + */ private getDefaultProviderName(): string { let defaultProvider: string; if (this._providerNameToDisplayNameMap) { diff --git a/src/sql/parts/connection/connectionDialog/connectionDialogWidget.ts b/src/sql/parts/connection/connectionDialog/connectionDialogWidget.ts index 4ff2bfe1b4..96e2c2597b 100644 --- a/src/sql/parts/connection/connectionDialog/connectionDialogWidget.ts +++ b/src/sql/parts/connection/connectionDialog/connectionDialogWidget.ts @@ -7,13 +7,13 @@ import 'vs/css!./media/connectionDialog'; import { Button } from 'sql/base/browser/ui/button/button'; import { attachModalDialogStyler, attachButtonStyler } from 'sql/common/theme/styler'; import { SelectBox } from 'sql/base/browser/ui/selectBox/selectBox'; -import { IConnectionProfile } from 'sql/parts/connection/common/interfaces'; +import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; import { Modal } from 'sql/base/browser/ui/modal/modal'; -import { IConnectionManagementService, INewConnectionParams } from 'sql/parts/connection/common/connectionManagement'; +import { IConnectionManagementService, INewConnectionParams } from 'sql/platform/connection/common/connectionManagement'; import * as DialogHelper from 'sql/base/browser/ui/modal/dialogHelper'; import { TreeCreationUtils } from 'sql/parts/objectExplorer/viewlet/treeCreationUtils'; import { TreeUpdateUtils } from 'sql/parts/objectExplorer/viewlet/treeUpdateUtils'; -import { ConnectionProfile } from 'sql/parts/connection/common/connectionProfile'; +import { ConnectionProfile } from 'sql/platform/connection/common/connectionProfile'; import { TabbedPanel, PanelTabIdentifier } from 'sql/base/browser/ui/panel/panel'; import { RecentConnectionTreeController, RecentConnectionActionsProvider } from 'sql/parts/connection/connectionDialog/recentConnectionTreeController'; import { SavedConnectionTreeController } from 'sql/parts/connection/connectionDialog/savedConnectionTreeController'; diff --git a/src/sql/parts/connection/connectionDialog/connectionWidget.ts b/src/sql/parts/connection/connectionDialog/connectionWidget.ts index 8e86a151b3..eea78dfa1d 100644 --- a/src/sql/parts/connection/connectionDialog/connectionWidget.ts +++ b/src/sql/parts/connection/connectionDialog/connectionWidget.ts @@ -13,16 +13,16 @@ import { Checkbox } from 'sql/base/browser/ui/checkbox/checkbox'; import { InputBox } from 'sql/base/browser/ui/inputBox/inputBox'; import * as DialogHelper from 'sql/base/browser/ui/modal/dialogHelper'; import { IConnectionComponentCallbacks } from 'sql/parts/connection/connectionDialog/connectionDialogService'; -import { IConnectionProfile } from 'sql/parts/connection/common/interfaces'; +import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; import { ConnectionOptionSpecialType } from 'sql/workbench/api/common/sqlExtHostTypes'; -import * as Constants from 'sql/parts/connection/common/constants'; -import { ConnectionProfileGroup, IConnectionProfileGroup } from 'sql/parts/connection/common/connectionProfileGroup'; +import * as Constants from 'sql/platform/connection/common/constants'; +import { ConnectionProfileGroup, IConnectionProfileGroup } from 'sql/platform/connection/common/connectionProfileGroup'; import { Dropdown } from 'sql/base/browser/ui/editableDropdown/dropdown'; -import { IConnectionManagementService } from 'sql/parts/connection/common/connectionManagement'; -import { ICapabilitiesService } from 'sql/services/capabilities/capabilitiesService'; -import { ConnectionProfile } from '../common/connectionProfile'; +import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement'; +import { ICapabilitiesService } from 'sql/platform/capabilities/common/capabilitiesService'; +import { ConnectionProfile } from 'sql/platform/connection/common/connectionProfile'; import * as styler from 'sql/common/theme/styler'; -import { IAccountManagementService } from 'sql/services/accountManagement/interfaces'; +import { IAccountManagementService } from 'sql/platform/accountManagement/common/interfaces'; import * as sqlops from 'sqlops'; diff --git a/src/sql/parts/connection/connectionDialog/recentConnectionTreeController.ts b/src/sql/parts/connection/connectionDialog/recentConnectionTreeController.ts index 62cd648898..09fb455de0 100644 --- a/src/sql/parts/connection/connectionDialog/recentConnectionTreeController.ts +++ b/src/sql/parts/connection/connectionDialog/recentConnectionTreeController.ts @@ -12,12 +12,12 @@ import { IKeyboardEvent } from 'vs/base/browser/keyboardEvent'; import { ClearSingleRecentConnectionAction } from 'sql/parts/connection/common/connectionActions'; import { ContributableActionProvider } from 'vs/workbench/browser/actions'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; -import { IConnectionManagementService } from 'sql/parts/connection/common/connectionManagement'; -import { ConnectionProfile } from 'sql/parts/connection/common/connectionProfile'; +import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement'; +import { ConnectionProfile } from 'sql/platform/connection/common/connectionProfile'; import { IAction } from 'vs/base/common/actions'; import { Event, Emitter } from 'vs/base/common/event'; import mouse = require('vs/base/browser/mouseEvent'); -import { IConnectionProfile } from 'sql/parts/connection/common/interfaces'; +import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; export class RecentConnectionActionsProvider extends ContributableActionProvider { private _onRecentConnectionRemoved = new Emitter(); @@ -33,7 +33,7 @@ export class RecentConnectionActionsProvider extends ContributableActionProvider private getRecentConnectionActions(tree: ITree, element: any): IAction[] { let actions: IAction[] = []; let clearSingleConnectionAction = this._instantiationService.createInstance(ClearSingleRecentConnectionAction, ClearSingleRecentConnectionAction.ID, - ClearSingleRecentConnectionAction.LABEL,element); + ClearSingleRecentConnectionAction.LABEL, element); clearSingleConnectionAction.onRecentConnectionRemoved(() => this._onRecentConnectionRemoved.fire()); actions.push(clearSingleConnectionAction); return actions; diff --git a/src/sql/parts/dashboard/common/actions.ts b/src/sql/parts/dashboard/common/actions.ts index f965e5e73e..be03506835 100644 --- a/src/sql/parts/dashboard/common/actions.ts +++ b/src/sql/parts/dashboard/common/actions.ts @@ -8,12 +8,12 @@ import { TPromise } from 'vs/base/common/winjs.base'; import { IContextMenuService } from 'vs/platform/contextview/browser/contextView'; import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent'; import { IDisposable } from 'vs/base/common/lifecycle'; -import { Event } from 'vs/base/common/event'; -import { IAngularEventingService, AngularEventType, IAngularEvent } from 'sql/services/angularEventing/angularEventingService'; +import { IAngularEventingService, AngularEventType, IAngularEvent } from 'sql/platform/angularEventing/common/angularEventingService'; import { INewDashboardTabDialogService } from 'sql/parts/dashboard/newDashboardTabDialog/interface'; import { IDashboardTab } from 'sql/platform/dashboard/common/dashboardRegistry'; -import { toDisposableSubscription } from 'sql/parts/common/rxjsUtils'; +import { toDisposableSubscription } from 'sql/base/node/rxjsUtils'; + export class EditDashboardAction extends Action { private static readonly ID = 'editDashboard'; diff --git a/src/sql/parts/dashboard/common/dashboardHelper.ts b/src/sql/parts/dashboard/common/dashboardHelper.ts index a5a29bf366..3583220c61 100644 --- a/src/sql/parts/dashboard/common/dashboardHelper.ts +++ b/src/sql/parts/dashboard/common/dashboardHelper.ts @@ -11,7 +11,7 @@ import { ContextKeyExpr, IContextKeyService } from 'vs/platform/contextkey/commo import { error } from 'sql/base/common/log'; import { WidgetConfig } from 'sql/parts/dashboard/common/dashboardWidget'; import { Extensions, IInsightRegistry } from 'sql/platform/dashboard/common/insightRegistry'; -import { ConnectionManagementInfo } from 'sql/parts/connection/common/connectionManagementInfo'; +import { ConnectionManagementInfo } from 'sql/platform/connection/common/connectionManagementInfo'; import { DashboardServiceInterface } from 'sql/parts/dashboard/services/dashboardServiceInterface.service'; import { WIDGETS_CONTAINER } from 'sql/parts/dashboard/containers/dashboardWidgetContainer.contribution'; import { GRID_CONTAINER } from 'sql/parts/dashboard/containers/dashboardGridContainer.contribution'; @@ -21,7 +21,7 @@ import { CONTROLHOST_CONTAINER } from 'sql/parts/dashboard/containers/dashboardC import { NAV_SECTION } from 'sql/parts/dashboard/containers/dashboardNavSection.contribution'; import { IDashboardContainerRegistry, Extensions as DashboardContainerExtensions } from 'sql/platform/dashboard/common/dashboardContainerRegistry'; import { SingleConnectionManagementService } from 'sql/services/common/commonServiceInterface.service'; -import * as Constants from 'sql/parts/connection/common/constants'; +import * as Constants from 'sql/platform/connection/common/constants'; const dashboardcontainerRegistry = Registry.as(DashboardContainerExtensions.dashboardContainerContributions); const containerTypes = [ diff --git a/src/sql/parts/dashboard/common/dashboardPage.component.ts b/src/sql/parts/dashboard/common/dashboardPage.component.ts index ab7895aeba..19bbb8b106 100644 --- a/src/sql/parts/dashboard/common/dashboardPage.component.ts +++ b/src/sql/parts/dashboard/common/dashboardPage.component.ts @@ -6,7 +6,7 @@ import 'vs/css!sql/parts/dashboard/common/dashboardPage'; import 'sql/parts/dashboard/common/dashboardPanelStyles'; -import { Component, Inject, forwardRef, ViewChild, ElementRef, ViewChildren, QueryList, OnDestroy, ChangeDetectorRef } from '@angular/core'; +import { Component, Inject, forwardRef, ViewChild, ElementRef, ViewChildren, QueryList, ChangeDetectorRef } from '@angular/core'; import { DashboardServiceInterface } from 'sql/parts/dashboard/services/dashboardServiceInterface.service'; import { CommonServiceInterface, SingleConnectionManagementService } from 'sql/services/common/commonServiceInterface.service'; @@ -16,13 +16,13 @@ import { PanelComponent } from 'sql/base/browser/ui/panel/panel.component'; import { IDashboardRegistry, Extensions as DashboardExtensions, IDashboardTab } from 'sql/platform/dashboard/common/dashboardRegistry'; import { PinUnpinTabAction, AddFeatureTabAction } from './actions'; import { TabComponent, TabChild } from 'sql/base/browser/ui/panel/tab.component'; -import { AngularEventType, IAngularEventingService } from 'sql/services/angularEventing/angularEventingService'; +import { AngularEventType, IAngularEventingService } from 'sql/platform/angularEventing/common/angularEventingService'; import { DashboardTab, IConfigModifierCollection } from 'sql/parts/dashboard/common/interfaces'; import * as dashboardHelper from 'sql/parts/dashboard/common/dashboardHelper'; import { WIDGETS_CONTAINER } from 'sql/parts/dashboard/containers/dashboardWidgetContainer.contribution'; import { GRID_CONTAINER } from 'sql/parts/dashboard/containers/dashboardGridContainer.contribution'; -import { AngularDisposable } from 'sql/base/common/lifecycle'; -import * as Constants from 'sql/parts/connection/common/constants'; +import { AngularDisposable } from 'sql/base/node/lifecycle'; +import * as Constants from 'sql/platform/connection/common/constants'; import { Registry } from 'vs/platform/registry/common/platform'; import * as types from 'vs/base/common/types'; diff --git a/src/sql/parts/dashboard/common/dashboardTab.contribution.ts b/src/sql/parts/dashboard/common/dashboardTab.contribution.ts index f9fe389dd7..695846cdff 100644 --- a/src/sql/parts/dashboard/common/dashboardTab.contribution.ts +++ b/src/sql/parts/dashboard/common/dashboardTab.contribution.ts @@ -7,7 +7,7 @@ import { IJSONSchema } from 'vs/base/common/jsonSchema'; import { localize } from 'vs/nls'; import * as types from 'vs/base/common/types'; -import * as Constants from 'sql/parts/connection/common/constants'; +import * as Constants from 'sql/platform/connection/common/constants'; import { registerTab } from 'sql/platform/dashboard/common/dashboardRegistry'; import { generateContainerTypeSchemaProperties } from 'sql/platform/dashboard/common/dashboardContainerRegistry'; import { NAV_SECTION, validateNavSectionContributionAndRegisterIcon } from 'sql/parts/dashboard/containers/dashboardNavSection.contribution'; diff --git a/src/sql/parts/dashboard/common/interfaces.ts b/src/sql/parts/dashboard/common/interfaces.ts index 8189abd40d..6964892807 100644 --- a/src/sql/parts/dashboard/common/interfaces.ts +++ b/src/sql/parts/dashboard/common/interfaces.ts @@ -6,10 +6,8 @@ import { OnDestroy } from '@angular/core'; import { Event } from 'vs/base/common/event'; -import { IDisposable, dispose } from 'vs/base/common/lifecycle'; import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey'; -import { AngularDisposable } from 'sql/base/common/lifecycle'; import { TabChild } from 'sql/base/browser/ui/panel/tab.component'; import { SingleConnectionManagementService } from 'sql/services/common/commonServiceInterface.service'; diff --git a/src/sql/parts/dashboard/containers/dashboardGridContainer.component.ts b/src/sql/parts/dashboard/containers/dashboardGridContainer.component.ts index b128bf1046..fd9e513c76 100644 --- a/src/sql/parts/dashboard/containers/dashboardGridContainer.component.ts +++ b/src/sql/parts/dashboard/containers/dashboardGridContainer.component.ts @@ -5,22 +5,15 @@ import 'vs/css!./dashboardGridContainer'; -import { Component, Inject, Input, forwardRef, ViewChild, ElementRef, ViewChildren, QueryList, OnDestroy, ChangeDetectorRef, EventEmitter } from '@angular/core'; -import { NgGridConfig, NgGrid, NgGridItem } from 'angular2-grid'; -import { concat } from 'rxjs/operator/concat'; +import { Component, Inject, Input, forwardRef, ElementRef, ViewChildren, QueryList, OnDestroy, ChangeDetectorRef } from '@angular/core'; -import { DashboardServiceInterface } from 'sql/parts/dashboard/services/dashboardServiceInterface.service'; import { CommonServiceInterface } from 'sql/services/common/commonServiceInterface.service'; import { TabConfig, WidgetConfig } from 'sql/parts/dashboard/common/dashboardWidget'; import { DashboardWidgetWrapper } from 'sql/parts/dashboard/contents/dashboardWidgetWrapper.component'; -import { subscriptionToDisposable } from 'sql/base/common/lifecycle'; import { DashboardTab } from 'sql/parts/dashboard/common/interfaces'; import { WebviewContent } from 'sql/parts/dashboard/contents/webviewContent.component'; import { TabChild } from 'sql/base/browser/ui/panel/tab.component'; -import { Disposable, IDisposable } from 'vs/base/common/lifecycle'; -import { ConfigurationTarget } from 'vs/platform/configuration/common/configuration'; -import * as objects from 'vs/base/common/objects'; import { Event, Emitter } from 'vs/base/common/event'; export interface GridCellConfig { diff --git a/src/sql/parts/dashboard/containers/dashboardHomeContainer.component.ts b/src/sql/parts/dashboard/containers/dashboardHomeContainer.component.ts index 3f2f75bc3e..94605cf3e7 100644 --- a/src/sql/parts/dashboard/containers/dashboardHomeContainer.component.ts +++ b/src/sql/parts/dashboard/containers/dashboardHomeContainer.component.ts @@ -8,11 +8,10 @@ import 'vs/css!./dashboardHomeContainer'; import { Component, forwardRef, Input, ChangeDetectorRef, Inject, ViewChild, ContentChild } from '@angular/core'; import { DashboardWidgetContainer } from 'sql/parts/dashboard/containers/dashboardWidgetContainer.component'; -import { DashboardTab } from 'sql/parts/dashboard/common/interfaces'; import { WidgetConfig } from 'sql/parts/dashboard/common/dashboardWidget'; import { DashboardServiceInterface } from 'sql/parts/dashboard/services/dashboardServiceInterface.service'; import { CommonServiceInterface } from 'sql/services/common/commonServiceInterface.service'; -import { AngularEventType, IAngularEventingService } from 'sql/services/angularEventing/angularEventingService'; +import { AngularEventType, IAngularEventingService } from 'sql/platform/angularEventing/common/angularEventingService'; import { DashboardWidgetWrapper } from 'sql/parts/dashboard/contents/dashboardWidgetWrapper.component'; import { ScrollableDirective } from 'sql/base/browser/ui/scrollable/scrollable.directive'; import { TabChild } from 'sql/base/browser/ui/panel/tab.component'; diff --git a/src/sql/parts/dashboard/containers/dashboardWidgetContainer.component.ts b/src/sql/parts/dashboard/containers/dashboardWidgetContainer.component.ts index 1705848d5b..ff3c99d1fa 100644 --- a/src/sql/parts/dashboard/containers/dashboardWidgetContainer.component.ts +++ b/src/sql/parts/dashboard/containers/dashboardWidgetContainer.component.ts @@ -5,20 +5,13 @@ import 'vs/css!./dashboardWidgetContainer'; -import { Component, Inject, Input, forwardRef, ViewChild, ViewChildren, QueryList, OnDestroy, ChangeDetectorRef, EventEmitter, OnChanges, AfterContentInit } from '@angular/core'; -import { NgGridConfig, NgGrid, NgGridItem } from 'angular2-grid'; +import { Component, Inject, Input, forwardRef, ViewChild, OnDestroy, ChangeDetectorRef, AfterContentInit } from '@angular/core'; -import { DashboardServiceInterface } from 'sql/parts/dashboard/services/dashboardServiceInterface.service'; import { TabConfig, WidgetConfig } from 'sql/parts/dashboard/common/dashboardWidget'; -import { DashboardWidgetWrapper } from 'sql/parts/dashboard/contents/dashboardWidgetWrapper.component'; -import { subscriptionToDisposable } from 'sql/base/common/lifecycle'; import { DashboardTab } from 'sql/parts/dashboard/common/interfaces'; import { WidgetContent } from 'sql/parts/dashboard/contents/widgetContent.component'; import { TabChild } from 'sql/base/browser/ui/panel/tab.component'; -import { Disposable, IDisposable } from 'vs/base/common/lifecycle'; -import { ConfigurationTarget } from 'vs/platform/configuration/common/configuration'; -import * as objects from 'vs/base/common/objects'; import { Event, Emitter } from 'vs/base/common/event'; @Component({ diff --git a/src/sql/parts/dashboard/contents/dashboardWidgetWrapper.component.ts b/src/sql/parts/dashboard/contents/dashboardWidgetWrapper.component.ts index 85b1f8f539..5175c7b95c 100644 --- a/src/sql/parts/dashboard/contents/dashboardWidgetWrapper.component.ts +++ b/src/sql/parts/dashboard/contents/dashboardWidgetWrapper.component.ts @@ -6,8 +6,8 @@ import 'vs/css!sql/media/icons/common-icons'; import 'vs/css!./dashboardWidgetWrapper'; import { - Component, Input, Inject, forwardRef, ComponentFactoryResolver, AfterContentInit, ViewChild, - ElementRef, OnInit, ChangeDetectorRef, OnDestroy, ReflectiveInjector, Injector, Type, ComponentRef + Component, Input, Inject, forwardRef, ComponentFactoryResolver, ViewChild, + ElementRef, OnInit, ChangeDetectorRef, ReflectiveInjector, Injector, Type, ComponentRef } from '@angular/core'; import { ComponentHostDirective } from 'sql/parts/dashboard/common/componentHost.directive'; @@ -15,7 +15,7 @@ import { WidgetConfig, WIDGET_CONFIG, IDashboardWidget } from 'sql/parts/dashboa import { Extensions, IInsightRegistry } from 'sql/platform/dashboard/common/insightRegistry'; import { error } from 'sql/base/common/log'; import { RefreshWidgetAction, ToggleMoreWidgetAction, DeleteWidgetAction, CollapseWidgetAction } from 'sql/parts/dashboard/common/actions'; -import { AngularDisposable } from 'sql/base/common/lifecycle'; +import { AngularDisposable } from 'sql/base/node/lifecycle'; /* Widgets */ import { PropertiesWidgetComponent } from 'sql/parts/dashboard/widgets/properties/propertiesWidget.component'; @@ -24,10 +24,8 @@ import { TasksWidget } from 'sql/parts/dashboard/widgets/tasks/tasksWidget.compo import { InsightsWidget } from 'sql/parts/dashboard/widgets/insights/insightsWidget.component'; import { WebviewWidget } from 'sql/parts/dashboard/widgets/webview/webviewWidget.component'; -import { DashboardServiceInterface } from 'sql/parts/dashboard/services/dashboardServiceInterface.service'; import { CommonServiceInterface } from 'sql/services/common/commonServiceInterface.service'; -import { IDisposable } from 'vs/base/common/lifecycle'; import { IColorTheme, IWorkbenchThemeService } from 'vs/workbench/services/themes/common/workbenchThemeService'; import * as colors from 'vs/platform/theme/common/colorRegistry'; import * as themeColors from 'vs/workbench/common/theme'; @@ -36,7 +34,6 @@ import { Registry } from 'vs/platform/registry/common/platform'; import { ActionBar } from 'vs/base/browser/ui/actionbar/actionbar'; import { memoize } from 'vs/base/common/decorators'; import { generateUuid } from 'vs/base/common/uuid'; -import { Emitter } from 'vs/base/common/event'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; const componentMap: { [x: string]: Type } = { diff --git a/src/sql/parts/dashboard/contents/webviewContent.component.ts b/src/sql/parts/dashboard/contents/webviewContent.component.ts index b57be30f79..ddc91799b4 100644 --- a/src/sql/parts/dashboard/contents/webviewContent.component.ts +++ b/src/sql/parts/dashboard/contents/webviewContent.component.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import 'vs/css!./webviewContent'; -import { Component, forwardRef, Input, OnInit, Inject, ChangeDetectorRef, ElementRef } from '@angular/core'; +import { Component, forwardRef, Input, OnInit, Inject, ElementRef } from '@angular/core'; import { Event, Emitter } from 'vs/base/common/event'; import { Parts, IPartService } from 'vs/workbench/services/part/common/partService'; @@ -17,8 +17,8 @@ import { IEnvironmentService } from 'vs/platform/environment/common/environment' import { WebviewElement } from 'vs/workbench/parts/webview/electron-browser/webviewElement'; import { DashboardServiceInterface } from 'sql/parts/dashboard/services/dashboardServiceInterface.service'; import { CommonServiceInterface } from 'sql/services/common/commonServiceInterface.service'; -import { IDashboardWebview, IDashboardViewService } from 'sql/services/dashboard/common/dashboardViewService'; -import { AngularDisposable } from 'sql/base/common/lifecycle'; +import { IDashboardWebview, IDashboardViewService } from 'sql/platform/dashboard/common/dashboardViewService'; +import { AngularDisposable } from 'sql/base/node/lifecycle'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; import * as sqlops from 'sqlops'; diff --git a/src/sql/parts/dashboard/contents/widgetContent.component.ts b/src/sql/parts/dashboard/contents/widgetContent.component.ts index 167c6592db..8a0d9c6a0d 100644 --- a/src/sql/parts/dashboard/contents/widgetContent.component.ts +++ b/src/sql/parts/dashboard/contents/widgetContent.component.ts @@ -12,9 +12,9 @@ import { DashboardServiceInterface } from 'sql/parts/dashboard/services/dashboar import { CommonServiceInterface } from 'sql/services/common/commonServiceInterface.service'; import { WidgetConfig } from 'sql/parts/dashboard/common/dashboardWidget'; import { DashboardWidgetWrapper } from 'sql/parts/dashboard/contents/dashboardWidgetWrapper.component'; -import { subscriptionToDisposable, AngularDisposable } from 'sql/base/common/lifecycle'; +import { subscriptionToDisposable, AngularDisposable } from 'sql/base/node/lifecycle'; -import { Disposable, IDisposable } from 'vs/base/common/lifecycle'; +import { IDisposable } from 'vs/base/common/lifecycle'; import { ConfigurationTarget } from 'vs/platform/configuration/common/configuration'; import * as objects from 'vs/base/common/objects'; import { Event, Emitter } from 'vs/base/common/event'; diff --git a/src/sql/parts/dashboard/dashboard.component.ts b/src/sql/parts/dashboard/dashboard.component.ts index 685f259cf9..d25b9f3f76 100644 --- a/src/sql/parts/dashboard/dashboard.component.ts +++ b/src/sql/parts/dashboard/dashboard.component.ts @@ -5,16 +5,15 @@ import 'vs/css!./dashboard'; -import { OnInit, Component, Inject, forwardRef, ElementRef, ChangeDetectorRef, OnDestroy, ViewChild } from '@angular/core'; +import { OnInit, Component, Inject, forwardRef, ElementRef, ChangeDetectorRef, ViewChild } from '@angular/core'; import { Router } from '@angular/router'; -import { DashboardServiceInterface } from './services/dashboardServiceInterface.service'; import { CommonServiceInterface } from 'sql/services/common/commonServiceInterface.service'; -import { IConnectionProfile } from 'sql/parts/connection/common/interfaces'; -import * as Utils from 'sql/parts/connection/common/utils'; +import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; +import * as Utils from 'sql/platform/connection/common/utils'; import { RefreshWidgetAction, EditDashboardAction } from 'sql/parts/dashboard/common/actions'; import { DashboardPage } from 'sql/parts/dashboard/common/dashboardPage.component'; -import { AngularDisposable } from 'sql/base/common/lifecycle'; +import { AngularDisposable } from 'sql/base/node/lifecycle'; import { IColorTheme, IWorkbenchThemeService } from 'vs/workbench/services/themes/common/workbenchThemeService'; import { IDisposable } from 'vs/base/common/lifecycle'; diff --git a/src/sql/parts/dashboard/dashboard.module.ts b/src/sql/parts/dashboard/dashboard.module.ts index 5b69226bf3..9ec0ebf91a 100644 --- a/src/sql/parts/dashboard/dashboard.module.ts +++ b/src/sql/parts/dashboard/dashboard.module.ts @@ -11,7 +11,7 @@ import { FormsModule } from '@angular/forms'; import { NgGridModule } from 'angular2-grid'; import { ChartsModule } from 'ng2-charts/ng2-charts'; -import CustomUrlSerializer from 'sql/common/urlSerializer'; +import CustomUrlSerializer from 'sql/base/node/urlSerializer'; import { Extensions, IInsightRegistry } from 'sql/platform/dashboard/common/insightRegistry'; import { Extensions as ComponentExtensions, IComponentRegistry } from 'sql/platform/dashboard/common/modelComponentRegistry'; import { IBootstrapParams, ISelector, providerIterator } from 'sql/services/bootstrap/bootstrapService'; diff --git a/src/sql/parts/dashboard/dashboardEditor.ts b/src/sql/parts/dashboard/dashboardEditor.ts index 981bdc3821..424dcce21f 100644 --- a/src/sql/parts/dashboard/dashboardEditor.ts +++ b/src/sql/parts/dashboard/dashboardEditor.ts @@ -19,10 +19,10 @@ import { bootstrapAngular } from 'sql/services/bootstrap/bootstrapService'; import { IDashboardComponentParams } from 'sql/services/bootstrap/bootstrapParams'; import { DASHBOARD_SELECTOR } from 'sql/parts/dashboard/dashboard.component'; import { ConnectionContextKey } from 'sql/parts/connection/common/connectionContextKey'; -import { IDashboardService } from 'sql/services/dashboard/common/dashboardService'; -import { ConnectionProfile } from 'sql/parts/connection/common/connectionProfile'; -import { IConnectionProfile } from 'sql/parts/connection/common/interfaces'; -import { IConnectionManagementService } from 'sql/parts/connection/common/connectionManagement'; +import { IDashboardService } from 'sql/platform/dashboard/browser/dashboardService'; +import { ConnectionProfile } from 'sql/platform/connection/common/connectionProfile'; +import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; +import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement'; import { CancellationToken } from 'vs/base/common/cancellation'; export class DashboardEditor extends BaseEditor { diff --git a/src/sql/parts/dashboard/dashboardInput.ts b/src/sql/parts/dashboard/dashboardInput.ts index 22dd0e8205..cede721cc4 100644 --- a/src/sql/parts/dashboard/dashboardInput.ts +++ b/src/sql/parts/dashboard/dashboardInput.ts @@ -10,8 +10,8 @@ import URI from 'vs/base/common/uri'; import { IModelService } from 'vs/editor/common/services/modelService'; import { IModeService } from 'vs/editor/common/services/modeService'; -import { IConnectionProfile } from 'sql/parts/connection/common/interfaces'; -import { IConnectionManagementService } from 'sql/parts/connection/common/connectionManagement'; +import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; +import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement'; export class DashboardInput extends EditorInput { diff --git a/src/sql/parts/dashboard/newDashboardTabDialog/newDashboardTabDialogService.ts b/src/sql/parts/dashboard/newDashboardTabDialog/newDashboardTabDialogService.ts index 92e8c83c11..735a14b6ed 100644 --- a/src/sql/parts/dashboard/newDashboardTabDialog/newDashboardTabDialogService.ts +++ b/src/sql/parts/dashboard/newDashboardTabDialog/newDashboardTabDialogService.ts @@ -7,7 +7,7 @@ import { INewDashboardTabDialogService } from 'sql/parts/dashboard/newDashboardTabDialog/interface'; import { NewDashboardTabDialog } from 'sql/parts/dashboard/newDashboardTabDialog/newDashboardTabDialog'; import { IDashboardTab } from 'sql/platform/dashboard/common/dashboardRegistry'; -import { IAngularEventingService, AngularEventType } from 'sql/services/angularEventing/angularEventingService'; +import { IAngularEventingService, AngularEventType } from 'sql/platform/angularEventing/common/angularEventingService'; import { IDashboardUITab } from 'sql/parts/dashboard/newDashboardTabDialog/newDashboardTabViewModel'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; diff --git a/src/sql/parts/dashboard/pages/databaseDashboardPage.component.ts b/src/sql/parts/dashboard/pages/databaseDashboardPage.component.ts index 595babe78e..bb72b73f1b 100644 --- a/src/sql/parts/dashboard/pages/databaseDashboardPage.component.ts +++ b/src/sql/parts/dashboard/pages/databaseDashboardPage.component.ts @@ -11,13 +11,12 @@ import { IBreadcrumbService } from 'sql/base/browser/ui/breadcrumb/interfaces'; import { DashboardServiceInterface } from 'sql/parts/dashboard/services/dashboardServiceInterface.service'; import { WidgetConfig } from 'sql/parts/dashboard/common/dashboardWidget'; import { CommonServiceInterface } from 'sql/services/common/commonServiceInterface.service'; -import { IAngularEventingService } from 'sql/services/angularEventing/angularEventingService'; +import { IAngularEventingService } from 'sql/platform/angularEventing/common/angularEventingService'; import * as colors from 'vs/platform/theme/common/colorRegistry'; import * as nls from 'vs/nls'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; import { INotificationService } from 'vs/platform/notification/common/notification'; -import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey'; import { IConfigurationService } from 'vs/platform/configuration/common/configuration'; export class DatabaseDashboardPage extends DashboardPage implements OnInit { diff --git a/src/sql/parts/dashboard/pages/serverDashboardPage.component.ts b/src/sql/parts/dashboard/pages/serverDashboardPage.component.ts index d35e2947cd..a289169960 100644 --- a/src/sql/parts/dashboard/pages/serverDashboardPage.component.ts +++ b/src/sql/parts/dashboard/pages/serverDashboardPage.component.ts @@ -11,13 +11,12 @@ import { IBreadcrumbService } from 'sql/base/browser/ui/breadcrumb/interfaces'; import { WidgetConfig } from 'sql/parts/dashboard/common/dashboardWidget'; import { DashboardServiceInterface } from 'sql/parts/dashboard/services/dashboardServiceInterface.service'; import { CommonServiceInterface } from 'sql/services/common/commonServiceInterface.service'; -import { IAngularEventingService } from 'sql/services/angularEventing/angularEventingService'; +import { IAngularEventingService } from 'sql/platform/angularEventing/common/angularEventingService'; import * as colors from 'vs/platform/theme/common/colorRegistry'; import * as nls from 'vs/nls'; import { INotificationService } from 'vs/platform/notification/common/notification'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; -import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey'; import { IConfigurationService } from 'vs/platform/configuration/common/configuration'; export class ServerDashboardPage extends DashboardPage implements OnInit { diff --git a/src/sql/parts/dashboard/services/breadcrumb.service.ts b/src/sql/parts/dashboard/services/breadcrumb.service.ts index df6e92c1ae..a095becc8d 100644 --- a/src/sql/parts/dashboard/services/breadcrumb.service.ts +++ b/src/sql/parts/dashboard/services/breadcrumb.service.ts @@ -3,15 +3,14 @@ * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { Injectable, forwardRef, Inject, OnDestroy } from '@angular/core'; +import { Injectable, forwardRef, Inject } from '@angular/core'; import { Subject } from 'rxjs/Subject'; import { DashboardServiceInterface } from './dashboardServiceInterface.service'; import { CommonServiceInterface } from 'sql/services/common/commonServiceInterface.service'; import { MenuItem, IBreadcrumbService } from 'sql/base/browser/ui/breadcrumb/interfaces'; -import { ConnectionProfile } from 'sql/parts/connection/common/connectionProfile'; +import { ConnectionProfile } from 'sql/platform/connection/common/connectionProfile'; -import { IDisposable, dispose } from 'vs/base/common/lifecycle'; import * as nls from 'vs/nls'; export enum BreadcrumbClass { @@ -24,11 +23,9 @@ export class BreadcrumbService implements IBreadcrumbService { public breadcrumbItem: Subject; private itemBreadcrums: MenuItem[]; private _currentPage: BreadcrumbClass; - private _bootstrap: DashboardServiceInterface; - constructor( @Inject(forwardRef(() => CommonServiceInterface)) private commonService: CommonServiceInterface) { - this._bootstrap = commonService as DashboardServiceInterface; - this._bootstrap.onUpdatePage(() => { + constructor( @Inject(forwardRef(() => CommonServiceInterface)) private commonService: DashboardServiceInterface) { + this.commonService.onUpdatePage(() => { this.setBreadcrumbs(this._currentPage); }); this.breadcrumbItem = new Subject(); @@ -43,7 +40,7 @@ export class BreadcrumbService implements IBreadcrumbService { private getBreadcrumbsLink(page: BreadcrumbClass): MenuItem[] { this.itemBreadcrums = []; - let profile = this._bootstrap.connectionManagementService.connectionInfo.connectionProfile; + let profile = this.commonService.connectionManagementService.connectionInfo.connectionProfile; this.itemBreadcrums.push({ label: nls.localize('homeCrumb', 'Home') }); switch (page) { case BreadcrumbClass.DatabasePage: diff --git a/src/sql/parts/dashboard/services/dashboardServiceInterface.service.ts b/src/sql/parts/dashboard/services/dashboardServiceInterface.service.ts index 79a3687c9c..12ecf0dc8a 100644 --- a/src/sql/parts/dashboard/services/dashboardServiceInterface.service.ts +++ b/src/sql/parts/dashboard/services/dashboardServiceInterface.service.ts @@ -10,12 +10,12 @@ import { Router } from '@angular/router'; /* SQL imports */ import { IDashboardComponentParams } from 'sql/services/bootstrap/bootstrapParams'; import { IBootstrapParams } from 'sql/services/bootstrap/bootstrapService'; -import { IMetadataService } from 'sql/services/metadata/metadataService'; -import { IConnectionManagementService } from 'sql/parts/connection/common/connectionManagement'; -import { IAdminService } from 'sql/parts/admin/common/adminService'; -import { IQueryManagementService } from 'sql/parts/query/common/queryManagement'; -import { toDisposableSubscription } from 'sql/parts/common/rxjsUtils'; -import { AngularEventType, IAngularEvent, IAngularEventingService } from 'sql/services/angularEventing/angularEventingService'; +import { IMetadataService } from 'sql/platform/metadata/common/metadataService'; +import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement'; +import { IAdminService } from 'sql/workbench/services/admin/common/adminService'; +import { IQueryManagementService } from 'sql/platform/query/common/queryManagement'; +import { toDisposableSubscription } from 'sql/base/node/rxjsUtils'; +import { AngularEventType, IAngularEvent, IAngularEventingService } from 'sql/platform/angularEventing/common/angularEventingService'; import { IDashboardTab } from 'sql/platform/dashboard/common/dashboardRegistry'; import { TabSettingConfig } from 'sql/parts/dashboard/common/dashboardWidget'; import { CommonServiceInterface } from 'sql/services/common/commonServiceInterface.service'; diff --git a/src/sql/parts/dashboard/widgets/explorer/explorerTree.ts b/src/sql/parts/dashboard/widgets/explorer/explorerTree.ts index bc3f3d4199..078a66d46a 100644 --- a/src/sql/parts/dashboard/widgets/explorer/explorerTree.ts +++ b/src/sql/parts/dashboard/widgets/explorer/explorerTree.ts @@ -5,18 +5,20 @@ import { Router } from '@angular/router'; -import { IConnectionProfile } from 'sql/parts/connection/common/interfaces'; -import { MetadataType, IConnectionManagementService, IErrorMessageService } from 'sql/parts/connection/common/connectionManagement'; +import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; +import { MetadataType, IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement'; import { SingleConnectionManagementService } from 'sql/services/common/commonServiceInterface.service'; import { NewQueryAction, ScriptSelectAction, EditDataAction, ScriptCreateAction, ScriptExecuteAction, ScriptAlterAction, BackupAction, ManageActionContext, BaseActionContext, ManageAction, RestoreAction } from 'sql/workbench/common/actions'; -import { ICapabilitiesService } from 'sql/services/capabilities/capabilitiesService'; -import { ConnectionManagementInfo } from 'sql/parts/connection/common/connectionManagementInfo'; -import * as Constants from 'sql/parts/connection/common/constants'; +import { ICapabilitiesService } from 'sql/platform/capabilities/common/capabilitiesService'; +import { ConnectionManagementInfo } from 'sql/platform/connection/common/connectionManagementInfo'; +import * as Constants from 'sql/platform/connection/common/constants'; import { IQueryEditorService } from 'sql/parts/query/common/queryEditorService'; -import { IScriptingService } from 'sql/services/scripting/scriptingService'; +import { IScriptingService } from 'sql/platform/scripting/common/scriptingService'; +import { IAngularEventingService } from 'sql/platform/angularEventing/common/angularEventingService'; +import { IErrorMessageService } from 'sql/platform/errorMessage/common/errorMessageService'; import { ObjectMetadata } from 'sqlops'; @@ -32,7 +34,6 @@ import { $ } from 'vs/base/browser/dom'; import { ExecuteCommandAction } from 'vs/platform/actions/common/actions'; import { IKeyboardEvent } from 'vs/base/browser/keyboardEvent'; import { IProgressService } from 'vs/platform/progress/common/progress'; -import { IAngularEventingService } from 'sql/services/angularEventing/angularEventingService'; export class ObjectMetadataWrapper implements ObjectMetadata { public metadataType: MetadataType; diff --git a/src/sql/parts/dashboard/widgets/explorer/explorerWidget.component.ts b/src/sql/parts/dashboard/widgets/explorer/explorerWidget.component.ts index 4036125278..cb2cb27b50 100644 --- a/src/sql/parts/dashboard/widgets/explorer/explorerWidget.component.ts +++ b/src/sql/parts/dashboard/widgets/explorer/explorerWidget.component.ts @@ -11,12 +11,11 @@ import { Component, Inject, forwardRef, ChangeDetectorRef, OnInit, ViewChild, El import { Router } from '@angular/router'; import { DashboardWidget, IDashboardWidget, WidgetConfig, WIDGET_CONFIG } from 'sql/parts/dashboard/common/dashboardWidget'; -import { DashboardServiceInterface } from 'sql/parts/dashboard/services/dashboardServiceInterface.service'; import { CommonServiceInterface } from 'sql/services/common/commonServiceInterface.service'; -import { toDisposableSubscription } from 'sql/parts/common/rxjsUtils'; +import { toDisposableSubscription } from 'sql/base/node/rxjsUtils'; import { ExplorerFilter, ExplorerRenderer, ExplorerDataSource, ExplorerController, ObjectMetadataWrapper, ExplorerModel } from './explorerTree'; -import { ConnectionProfile } from 'sql/parts/connection/common/connectionProfile'; -import { ICapabilitiesService } from 'sql/services/capabilities/capabilitiesService'; +import { ConnectionProfile } from 'sql/platform/connection/common/connectionProfile'; +import { ICapabilitiesService } from 'sql/platform/capabilities/common/capabilitiesService'; import { InputBox, IInputOptions } from 'vs/base/browser/ui/inputbox/inputBox'; import { attachInputBoxStyler, attachListStyler } from 'vs/platform/theme/common/styler'; @@ -28,7 +27,6 @@ import { IContextViewService, IContextMenuService } from 'vs/platform/contextvie import { IWorkbenchThemeService } from 'vs/workbench/services/themes/common/workbenchThemeService'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; import { IProgressService } from 'vs/platform/progress/common/progress'; -import * as types from 'vs/base/common/types'; import { ScrollbarVisibility } from 'vs/base/common/scrollable'; @Component({ diff --git a/src/sql/parts/dashboard/widgets/insights/actions.ts b/src/sql/parts/dashboard/widgets/insights/actions.ts index ab037636bd..126c014bc9 100644 --- a/src/sql/parts/dashboard/widgets/insights/actions.ts +++ b/src/sql/parts/dashboard/widgets/insights/actions.ts @@ -7,7 +7,7 @@ import * as nls from 'vs/nls'; import { TPromise } from 'vs/base/common/winjs.base'; import * as TaskUtilities from 'sql/workbench/common/taskUtilities'; -import { RunQueryOnConnectionMode, IConnectionManagementService } from 'sql/parts/connection/common/connectionManagement'; +import { RunQueryOnConnectionMode, IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement'; import { IQueryEditorService } from 'sql/parts/query/common/queryEditorService'; import { InsightActionContext } from 'sql/workbench/common/actions'; import { IObjectExplorerService } from 'sql/parts/objectExplorer/common/objectExplorerService'; diff --git a/src/sql/parts/dashboard/widgets/insights/insightsWidget.component.ts b/src/sql/parts/dashboard/widgets/insights/insightsWidget.component.ts index d64d280632..81b19c1c6b 100644 --- a/src/sql/parts/dashboard/widgets/insights/insightsWidget.component.ts +++ b/src/sql/parts/dashboard/widgets/insights/insightsWidget.component.ts @@ -9,11 +9,10 @@ import { import { Observable } from 'rxjs/Observable'; import { DashboardWidget, IDashboardWidget, WIDGET_CONFIG, WidgetConfig } from 'sql/parts/dashboard/common/dashboardWidget'; -import { DashboardServiceInterface } from 'sql/parts/dashboard/services/dashboardServiceInterface.service'; import { CommonServiceInterface } from 'sql/services/common/commonServiceInterface.service'; import { ComponentHostDirective } from 'sql/parts/dashboard/common/componentHost.directive'; import { InsightAction, InsightActionContext } from 'sql/workbench/common/actions'; -import { toDisposableSubscription } from 'sql/parts/common/rxjsUtils'; +import { toDisposableSubscription } from 'sql/base/node/rxjsUtils'; import { IInsightsConfig, IInsightsView } from './interfaces'; import { Extensions, IInsightRegistry } from 'sql/platform/dashboard/common/insightRegistry'; import { insertValueRegex } from 'sql/parts/insights/common/interfaces'; diff --git a/src/sql/parts/dashboard/widgets/properties/propertiesWidget.component.ts b/src/sql/parts/dashboard/widgets/properties/propertiesWidget.component.ts index 078ee106df..11eeed6936 100644 --- a/src/sql/parts/dashboard/widgets/properties/propertiesWidget.component.ts +++ b/src/sql/parts/dashboard/widgets/properties/propertiesWidget.component.ts @@ -6,10 +6,9 @@ import { Component, Inject, forwardRef, ChangeDetectorRef, OnInit, ElementRef, ViewChild } from '@angular/core'; import { DashboardWidget, IDashboardWidget, WidgetConfig, WIDGET_CONFIG } from 'sql/parts/dashboard/common/dashboardWidget'; -import { DashboardServiceInterface } from 'sql/parts/dashboard/services/dashboardServiceInterface.service'; import { CommonServiceInterface } from 'sql/services/common/commonServiceInterface.service'; -import { ConnectionManagementInfo } from 'sql/parts/connection/common/connectionManagementInfo'; -import { toDisposableSubscription } from 'sql/parts/common/rxjsUtils'; +import { ConnectionManagementInfo } from 'sql/platform/connection/common/connectionManagementInfo'; +import { toDisposableSubscription } from 'sql/base/node/rxjsUtils'; import { error } from 'sql/base/common/log'; import { IDashboardRegistry, Extensions as DashboardExtensions } from 'sql/platform/dashboard/common/dashboardRegistry'; diff --git a/src/sql/parts/dashboard/widgets/tasks/tasksWidget.component.ts b/src/sql/parts/dashboard/widgets/tasks/tasksWidget.component.ts index d97ae14349..7564e6266c 100644 --- a/src/sql/parts/dashboard/widgets/tasks/tasksWidget.component.ts +++ b/src/sql/parts/dashboard/widgets/tasks/tasksWidget.component.ts @@ -14,7 +14,7 @@ import { DashboardWidget, IDashboardWidget, WidgetConfig, WIDGET_CONFIG } from ' import { DashboardServiceInterface } from 'sql/parts/dashboard/services/dashboardServiceInterface.service'; import { CommonServiceInterface } from 'sql/services/common/commonServiceInterface.service'; import { TaskRegistry } from 'sql/platform/tasks/common/tasks'; -import { IConnectionProfile } from 'sql/parts/connection/common/interfaces'; +import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; import { BaseActionContext } from 'sql/workbench/common/actions'; /* VS imports */ diff --git a/src/sql/parts/dashboard/widgets/webview/webviewWidget.component.ts b/src/sql/parts/dashboard/widgets/webview/webviewWidget.component.ts index ecdf980a7e..d0527777e1 100644 --- a/src/sql/parts/dashboard/widgets/webview/webviewWidget.component.ts +++ b/src/sql/parts/dashboard/widgets/webview/webviewWidget.component.ts @@ -13,7 +13,7 @@ import { memoize } from 'vs/base/common/decorators'; import { DashboardWidget, IDashboardWidget, WidgetConfig, WIDGET_CONFIG } from 'sql/parts/dashboard/common/dashboardWidget'; import { DashboardServiceInterface } from 'sql/parts/dashboard/services/dashboardServiceInterface.service'; import { CommonServiceInterface } from 'sql/services/common/commonServiceInterface.service'; -import { IDashboardWebview, IDashboardViewService } from 'sql/services/dashboard/common/dashboardViewService'; +import { IDashboardWebview, IDashboardViewService } from 'sql/platform/dashboard/common/dashboardViewService'; import * as sqlops from 'sqlops'; import { IWorkbenchThemeService } from 'vs/workbench/services/themes/common/workbenchThemeService'; diff --git a/src/sql/parts/disasterRecovery/backup/backup.component.ts b/src/sql/parts/disasterRecovery/backup/backup.component.ts index fbdd8ca4c8..220d45e0fd 100644 --- a/src/sql/parts/disasterRecovery/backup/backup.component.ts +++ b/src/sql/parts/disasterRecovery/backup/backup.component.ts @@ -14,12 +14,12 @@ import { ModalFooterStyle } from 'sql/base/browser/ui/modal/modal'; import { CategoryView } from 'sql/base/browser/ui/modal/optionsDialog'; import { SelectBox } from 'sql/base/browser/ui/selectBox/selectBox'; import { attachButtonStyler, attachListBoxStyler, attachInputBoxStyler, attachSelectBoxStyler, attachCheckboxStyler } from 'sql/common/theme/styler'; -import { IConnectionProfile } from 'sql/parts/connection/common/interfaces'; +import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; import * as BackupConstants from 'sql/parts/disasterRecovery/backup/constants'; -import { IBackupService, IBackupUiService, TaskExecutionMode } from 'sql/parts/disasterRecovery/backup/common/backupService'; +import { IBackupService, IBackupUiService, TaskExecutionMode } from 'sql/platform/backup/common/backupService'; import FileValidationConstants = require('sql/parts/fileBrowser/common/fileValidationServiceConstants'); -import { IFileBrowserDialogController } from 'sql/parts/fileBrowser/common/interfaces'; -import { IConnectionManagementService } from 'sql/parts/connection/common/connectionManagement'; +import { IFileBrowserDialogController } from 'sql/platform/fileBrowser/common/interfaces'; +import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement'; import { ScrollableSplitView } from 'sql/base/browser/ui/scrollableSplitview/scrollableSplitview'; import { MessageType } from 'vs/base/browser/ui/inputbox/inputBox'; diff --git a/src/sql/parts/disasterRecovery/backup/backupDialog.ts b/src/sql/parts/disasterRecovery/backup/backupDialog.ts index 1e5cb691f4..01e1445fea 100644 --- a/src/sql/parts/disasterRecovery/backup/backupDialog.ts +++ b/src/sql/parts/disasterRecovery/backup/backupDialog.ts @@ -4,11 +4,11 @@ *--------------------------------------------------------------------------------------------*/ import { Modal } from 'sql/base/browser/ui/modal/modal'; -import { IConnectionProfile } from 'sql/parts/connection/common/interfaces'; +import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; import { BackupModule } from 'sql/parts/disasterRecovery/backup/backup.module'; import { BACKUP_SELECTOR } from 'sql/parts/disasterRecovery/backup/backup.component'; import { attachModalDialogStyler } from 'sql/common/theme/styler'; -import { IConnectionManagementService } from 'sql/parts/connection/common/connectionManagement'; +import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement'; import * as TelemetryKeys from 'sql/common/telemetryKeys'; import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey'; diff --git a/src/sql/parts/disasterRecovery/backup/constants.ts b/src/sql/parts/disasterRecovery/backup/constants.ts index a55a50ebb8..5ee021fd4b 100644 --- a/src/sql/parts/disasterRecovery/backup/constants.ts +++ b/src/sql/parts/disasterRecovery/backup/constants.ts @@ -42,7 +42,7 @@ export const tripleDES = 'Triple DES'; export const serverCertificate = localize('backup.serverCertificate', "Server Certificate"); export const asymmetricKey = localize('backup.asymmetricKey', "Asymmetric Key"); -export const fileFiltersSet: {label: string, filters: string[]}[] = [ +export const fileFiltersSet: { label: string, filters: string[] }[] = [ { label: localize('backup.filterBackupFiles', "Backup Files"), filters: ['*.bak', '*.trn', '*.log'] }, { label: localize('backup.allFiles', "All Files"), filters: ['*'] } -]; \ No newline at end of file +]; diff --git a/src/sql/parts/disasterRecovery/restore/restoreDialog.ts b/src/sql/parts/disasterRecovery/restore/restoreDialog.ts index 39fc2a7757..ae315ae9ef 100644 --- a/src/sql/parts/disasterRecovery/restore/restoreDialog.ts +++ b/src/sql/parts/disasterRecovery/restore/restoreDialog.ts @@ -41,7 +41,7 @@ import * as FileValidationConstants from 'sql/parts/fileBrowser/common/fileValid import { Dropdown } from 'sql/base/browser/ui/editableDropdown/dropdown'; import { TabbedPanel, PanelTabIdentifier } from 'sql/base/browser/ui/panel/panel'; import { ServiceOptionType } from 'sql/workbench/api/common/sqlExtHostTypes'; -import { IFileBrowserDialogController } from 'sql/parts/fileBrowser/common/interfaces'; +import { IFileBrowserDialogController } from 'sql/platform/fileBrowser/common/interfaces'; import { IClipboardService } from 'sql/platform/clipboard/common/clipboardService'; interface FileListElement { diff --git a/src/sql/parts/editData/common/editDataInput.ts b/src/sql/parts/editData/common/editDataInput.ts index e69d3e465d..c05fd87f36 100644 --- a/src/sql/parts/editData/common/editDataInput.ts +++ b/src/sql/parts/editData/common/editDataInput.ts @@ -5,8 +5,8 @@ import { TPromise } from 'vs/base/common/winjs.base'; import { EditorInput, EditorModel, ConfirmResult, EncodingMode } from 'vs/workbench/common/editor'; -import { IConnectionManagementService, IConnectableInput, INewConnectionParams } from 'sql/parts/connection/common/connectionManagement'; -import { IQueryModelService } from 'sql/parts/query/execution/queryModel'; +import { IConnectionManagementService, IConnectableInput, INewConnectionParams } from 'sql/platform/connection/common/connectionManagement'; +import { IQueryModelService } from 'sql/platform/query/common/queryModel'; import { IDisposable, dispose } from 'vs/base/common/lifecycle'; import { Event, Emitter } from 'vs/base/common/event'; import { EditSessionReadyParams, ISelectionData } from 'sqlops'; diff --git a/src/sql/parts/editData/editor/editDataEditor.ts b/src/sql/parts/editData/editor/editDataEditor.ts index aef6fb16f8..c13ae3c833 100644 --- a/src/sql/parts/editData/editor/editDataEditor.ts +++ b/src/sql/parts/editData/editor/editDataEditor.ts @@ -25,7 +25,7 @@ import { Taskbar, ITaskbarContent } from 'sql/base/browser/ui/taskbar/taskbar'; import { IContextMenuService } from 'vs/platform/contextview/browser/contextView'; import { IActionItem } from 'vs/base/browser/ui/actionbar/actionbar'; import { Action } from 'vs/base/common/actions'; -import { IQueryModelService } from 'sql/parts/query/execution/queryModel'; +import { IQueryModelService } from 'sql/platform/query/common/queryModel'; import { IEditorDescriptorService } from 'sql/parts/query/editor/editorDescriptorService'; import { RefreshTableAction, StopRefreshTableAction, ChangeMaxRowsAction, ChangeMaxRowsActionItem, ShowQueryPaneAction diff --git a/src/sql/parts/editData/editor/editDataResultsEditor.ts b/src/sql/parts/editData/editor/editDataResultsEditor.ts index 43cf8cfb45..f4d15ccfe3 100644 --- a/src/sql/parts/editData/editor/editDataResultsEditor.ts +++ b/src/sql/parts/editData/editor/editDataResultsEditor.ts @@ -16,7 +16,7 @@ import { IConfigurationService } from 'vs/platform/configuration/common/configur import { BaseEditor } from 'vs/workbench/browser/parts/editor/baseEditor'; import * as types from 'vs/base/common/types'; -import { IQueryModelService } from 'sql/parts/query/execution/queryModel'; +import { IQueryModelService } from 'sql/platform/query/common/queryModel'; import { bootstrapAngular } from 'sql/services/bootstrap/bootstrapService'; import { BareResultsGridInfo } from 'sql/parts/query/editor/queryResultsEditor'; import { IEditDataComponentParams } from 'sql/services/bootstrap/bootstrapParams'; diff --git a/src/sql/parts/editData/execution/editDataActions.ts b/src/sql/parts/editData/execution/editDataActions.ts index 773fca2e88..ccda9de0a2 100644 --- a/src/sql/parts/editData/execution/editDataActions.ts +++ b/src/sql/parts/editData/execution/editDataActions.ts @@ -6,10 +6,10 @@ import { Action, IActionItem, IActionRunner } from 'vs/base/common/actions'; import { TPromise } from 'vs/base/common/winjs.base'; import { IDisposable, dispose } from 'vs/base/common/lifecycle'; -import { IQueryModelService } from 'sql/parts/query/execution/queryModel'; +import { IQueryModelService } from 'sql/platform/query/common/queryModel'; import { SelectBox } from 'sql/base/browser/ui/selectBox/selectBox'; import { EventEmitter } from 'sql/base/common/eventEmitter'; -import { IConnectionManagementService } from 'sql/parts/connection/common/connectionManagement'; +import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement'; import { EditDataEditor } from 'sql/parts/editData/editor/editDataEditor'; import nls = require('vs/nls'); import * as dom from 'vs/base/browser/dom'; diff --git a/src/sql/parts/fileBrowser/common/fileValidationServiceConstants.ts b/src/sql/parts/fileBrowser/common/fileValidationServiceConstants.ts index d0c5954742..ce890092dd 100644 --- a/src/sql/parts/fileBrowser/common/fileValidationServiceConstants.ts +++ b/src/sql/parts/fileBrowser/common/fileValidationServiceConstants.ts @@ -8,4 +8,4 @@ */ export const backup: string = 'Backup'; -export const restore: string = 'Restore'; \ No newline at end of file +export const restore: string = 'Restore'; diff --git a/src/sql/parts/fileBrowser/fileBrowserDataSource.ts b/src/sql/parts/fileBrowser/fileBrowserDataSource.ts index 9740180d76..fb6949b3f1 100644 --- a/src/sql/parts/fileBrowser/fileBrowserDataSource.ts +++ b/src/sql/parts/fileBrowser/fileBrowserDataSource.ts @@ -5,7 +5,7 @@ 'use strict'; -import { IFileBrowserService } from 'sql/parts/fileBrowser/common/interfaces'; +import { IFileBrowserService } from 'sql/platform/fileBrowser/common/interfaces'; import { FileNode } from 'sql/parts/fileBrowser/common/fileNode'; import { TPromise } from 'vs/base/common/winjs.base'; import { ITree, IDataSource } from 'vs/base/parts/tree/browser/tree'; diff --git a/src/sql/parts/fileBrowser/fileBrowserDialogController.ts b/src/sql/parts/fileBrowser/fileBrowserDialogController.ts index b8d9c112d5..247efd2907 100644 --- a/src/sql/parts/fileBrowser/fileBrowserDialogController.ts +++ b/src/sql/parts/fileBrowser/fileBrowserDialogController.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; -import { IFileBrowserDialogController } from 'sql/parts/fileBrowser/common/interfaces'; +import { IFileBrowserDialogController } from 'sql/platform/fileBrowser/common/interfaces'; import { FileBrowserDialog } from 'sql/parts/fileBrowser/fileBrowserDialog'; import { localize } from 'vs/nls'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; @@ -23,7 +23,7 @@ export class FileBrowserDialogController implements IFileBrowserDialogController public showDialog(ownerUri: string, expandPath: string, - fileFilters: [{label: string, filters: string[]}], + fileFilters: [{ label: string, filters: string[] }], fileValidationServiceType: string, isWide: boolean, handleOnOk: (path: string) => void @@ -35,6 +35,6 @@ export class FileBrowserDialogController implements IFileBrowserDialogController this._fileBrowserDialog.setWide(isWide); this._fileBrowserDialog.onOk((filepath) => handleOnOk(filepath)); - this._fileBrowserDialog.open(ownerUri, expandPath, fileFilters, fileValidationServiceType); + this._fileBrowserDialog.open(ownerUri, expandPath, fileFilters, fileValidationServiceType); } } diff --git a/src/sql/parts/fileBrowser/fileBrowserTreeView.ts b/src/sql/parts/fileBrowser/fileBrowserTreeView.ts index 619a63e0c8..363c53b394 100644 --- a/src/sql/parts/fileBrowser/fileBrowserTreeView.ts +++ b/src/sql/parts/fileBrowser/fileBrowserTreeView.ts @@ -3,17 +3,16 @@ * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { IErrorMessageService } from 'sql/parts/connection/common/connectionManagement'; import { FileBrowserDataSource } from 'sql/parts/fileBrowser/fileBrowserDataSource'; import { FileBrowserController } from 'sql/parts/fileBrowser/fileBrowserController'; import { FileBrowserRenderer } from 'sql/parts/fileBrowser/fileBrowserRenderer'; -import { IFileBrowserService } from 'sql/parts/fileBrowser/common/interfaces'; +import { IFileBrowserService } from 'sql/platform/fileBrowser/common/interfaces'; import { FileNode } from 'sql/parts/fileBrowser/common/fileNode'; import errors = require('vs/base/common/errors'); import { IDisposable, dispose } from 'vs/base/common/lifecycle'; import * as DOM from 'vs/base/browser/dom'; import nls = require('vs/nls'); -import { DefaultFilter, DefaultAccessibilityProvider, DefaultController, DefaultDragAndDrop } from 'vs/base/parts/tree/browser/treeDefaults'; +import { DefaultFilter, DefaultAccessibilityProvider, DefaultDragAndDrop } from 'vs/base/parts/tree/browser/treeDefaults'; import { Tree } from 'vs/base/parts/tree/browser/treeImpl'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; import { attachListStyler } from 'vs/platform/theme/common/styler'; @@ -30,7 +29,6 @@ export class FileBrowserTreeView implements IDisposable { constructor( @IInstantiationService private _instantiationService: IInstantiationService, @IFileBrowserService private _fileBrowserService: IFileBrowserService, - @IErrorMessageService private _errorMessageService: IErrorMessageService, @IThemeService private _themeService: IThemeService ) { } diff --git a/src/sql/parts/fileBrowser/fileBrowserViewModel.ts b/src/sql/parts/fileBrowser/fileBrowserViewModel.ts index 48a42e0466..17df93de91 100644 --- a/src/sql/parts/fileBrowser/fileBrowserViewModel.ts +++ b/src/sql/parts/fileBrowser/fileBrowserViewModel.ts @@ -5,7 +5,7 @@ 'use strict'; -import { IFileBrowserService } from 'sql/parts/fileBrowser/common/interfaces'; +import { IFileBrowserService } from 'sql/platform/fileBrowser/common/interfaces'; import { localize } from 'vs/nls'; /** @@ -14,11 +14,11 @@ import { localize } from 'vs/nls'; export class FileBrowserViewModel { private _ownerUri: string; private _expandPath: string; - private _fileFilters: [{label: string, filters: string[]}]; + private _fileFilters: [{ label: string, filters: string[] }]; private _fileValidationServiceType: string; public formattedFileFilters: string[]; - constructor(@IFileBrowserService private _fileBrowserService: IFileBrowserService) { + constructor( @IFileBrowserService private _fileBrowserService: IFileBrowserService) { } public onAddFileTree(onAddFileTreeCallback) { @@ -31,7 +31,7 @@ export class FileBrowserViewModel { public initialize(ownerUri: string, expandPath: string, - fileFilters: [ {label: string, filters: string[]} ], + fileFilters: [{ label: string, filters: string[] }], fileValidationServiceType: string, ) { this._ownerUri = ownerUri; @@ -39,7 +39,7 @@ export class FileBrowserViewModel { this._fileValidationServiceType = fileValidationServiceType; if (!fileFilters) { - this._fileFilters = [ {label: localize('allFiles', 'All files'), filters: ['*']} ]; + this._fileFilters = [{ label: localize('allFiles', 'All files'), filters: ['*'] }]; } else { this._fileFilters = fileFilters; } diff --git a/src/sql/parts/grid/services/dataService.ts b/src/sql/parts/grid/services/dataService.ts index b578a4a0e0..16c2ee4300 100644 --- a/src/sql/parts/grid/services/dataService.ts +++ b/src/sql/parts/grid/services/dataService.ts @@ -10,8 +10,8 @@ import { Subject } from 'rxjs/Subject'; import { Observer } from 'rxjs/Observer'; import { ResultSetSubset, EditUpdateCellResult, EditSubsetResult, EditCreateRowResult } from 'sqlops'; -import { IQueryModelService } from 'sql/parts/query/execution/queryModel'; -import { ResultSerializer } from 'sql/parts/query/common/resultSerializer'; +import { IQueryModelService } from 'sql/platform/query/common/queryModel'; +import { ResultSerializer } from 'sql/platform/node/resultSerializer'; import { ISaveRequest } from 'sql/parts/grid/common/interfaces'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; diff --git a/src/sql/parts/grid/views/gridCommands.ts b/src/sql/parts/grid/views/gridCommands.ts index 1723d50887..f895ae4efb 100644 --- a/src/sql/parts/grid/views/gridCommands.ts +++ b/src/sql/parts/grid/views/gridCommands.ts @@ -6,14 +6,14 @@ 'use strict'; import * as GridContentEvents from 'sql/parts/grid/common/gridContentEvents'; -import { IQueryModelService } from 'sql/parts/query/execution/queryModel'; +import { IQueryModelService } from 'sql/platform/query/common/queryModel'; import { QueryEditor } from 'sql/parts/query/editor/queryEditor'; import { EditDataEditor } from 'sql/parts/editData/editor/editDataEditor'; import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation'; import { IEditorService } from 'vs/workbench/services/editor/common/editorService'; -function runActionOnActiveResultsEditor (accessor: ServicesAccessor, eventName: string): void { +function runActionOnActiveResultsEditor(accessor: ServicesAccessor, eventName: string): void { let editorService = accessor.get(IEditorService); const candidates = [editorService.activeControl, ...editorService.visibleControls].filter(e => { if (e) { @@ -28,7 +28,7 @@ function runActionOnActiveResultsEditor (accessor: ServicesAccessor, eventName: if (candidates.length > 0) { let queryModelService: IQueryModelService = accessor.get(IQueryModelService); - let uri = ( candidates[0].input).uri; + let uri = (candidates[0].input).uri; queryModelService.sendGridContentEvent(uri, eventName); } } diff --git a/src/sql/parts/grid/views/gridParentComponent.ts b/src/sql/parts/grid/views/gridParentComponent.ts index c7f43c3c5f..6be7b98205 100644 --- a/src/sql/parts/grid/views/gridParentComponent.ts +++ b/src/sql/parts/grid/views/gridParentComponent.ts @@ -14,11 +14,11 @@ import 'vs/css!sql/parts/grid/media/slickGrid'; import { Subscription, Subject } from 'rxjs/Rx'; import { ElementRef, QueryList, ChangeDetectorRef, ViewChildren } from '@angular/core'; import { SlickGrid } from 'angular2-slickgrid'; -import { toDisposableSubscription } from 'sql/parts/common/rxjsUtils'; +import { toDisposableSubscription } from 'sql/base/node/rxjsUtils'; import * as Constants from 'sql/parts/query/common/constants'; import * as LocalizedConstants from 'sql/parts/query/common/localizedConstants'; import { IGridInfo, IGridDataSet, SaveFormat } from 'sql/parts/grid/common/interfaces'; -import * as Utils from 'sql/parts/connection/common/utils'; +import * as Utils from 'sql/platform/connection/common/utils'; import { DataService } from 'sql/parts/grid/services/dataService'; import * as actions from 'sql/parts/grid/views/gridActions'; import * as Services from 'sql/parts/grid/services/sharedServices'; @@ -235,7 +235,7 @@ export abstract class GridParentComponent { let selection = this.slickgrids.toArray()[index || this.activeGrid].getSelectedRanges(); if (selection) { selection = selection.map(c => { return { fromCell: c.fromCell - 1, toCell: c.toCell - 1, toRow: c.toRow, fromRow: c.fromRow }; }); - return selection; + return selection; } else { return undefined; } diff --git a/src/sql/parts/grid/views/query/chartViewer.component.html b/src/sql/parts/grid/views/query/chartViewer.component.html deleted file mode 100644 index dc704964d6..0000000000 --- a/src/sql/parts/grid/views/query/chartViewer.component.html +++ /dev/null @@ -1,261 +0,0 @@ -
-
-
-
- -
-
-
-
-
{{localizedStrings.CHART_TYPE}}
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{{localizedStrings.LEGEND}}
- - - - - -
{{localizedStrings.DATA_TYPE}}
-
-
- {{localizedStrings.NUMBER}} -
-
- {{localizedStrings.POINT}} -
-
- - - - -
{{localizedStrings.DATA_DIRECTION}}
-
-
- {{localizedStrings.VERTICAL}} -
-
- {{localizedStrings.HORIZONTAL}} -
-
- - - - - - - - - - - - - - - - {{localizedStrings.Y_AXIS_LABEL}} - - - - - - - {{localizedStrings.Y_AXIS_MAX_VAL}} - - - - {{localizedStrings.Y_AXIS_MIN_VAL}} - - - - - - - - - {{localizedStrings.X_AXIS_LABEL}} - - - - - - - {{localizedStrings.X_AXIS_MAX_VAL}} - - - - {{localizedStrings.X_AXIS_MIN_VAL}} - - - diff --git a/src/sql/parts/grid/views/query/chartViewer.component.ts b/src/sql/parts/grid/views/query/chartViewer.component.ts deleted file mode 100644 index ffc84af279..0000000000 --- a/src/sql/parts/grid/views/query/chartViewer.component.ts +++ /dev/null @@ -1,363 +0,0 @@ -/*--------------------------------------------------------------------------------------------- - * Copyright (c) Microsoft Corporation. All rights reserved. - * Licensed under the Source EULA. See License.txt in the project root for license information. - *--------------------------------------------------------------------------------------------*/ -import 'vs/css!sql/parts/grid/views/query/chartViewer'; - -import { - Component, Inject, forwardRef, OnInit, ComponentFactoryResolver, ViewChild, - OnDestroy, Input, ElementRef, ChangeDetectorRef -} from '@angular/core'; -import { NgGridItemConfig } from 'angular2-grid'; - -import { Taskbar } from 'sql/base/browser/ui/taskbar/taskbar'; -import { ComponentHostDirective } from 'sql/parts/dashboard/common/componentHost.directive'; -import { IGridDataSet } from 'sql/parts/grid/common/interfaces'; -import { IInsightData, IInsightsView, IInsightsConfig } from 'sql/parts/dashboard/widgets/insights/interfaces'; -import { Extensions, IInsightRegistry } from 'sql/platform/dashboard/common/insightRegistry'; -import { QueryEditor } from 'sql/parts/query/editor/queryEditor'; -import { ILineConfig } from 'sql/parts/dashboard/widgets/insights/views/charts/types/lineChart.component'; -import * as PathUtilities from 'sql/common/pathUtilities'; -import { IChartViewActionContext, CopyAction, CreateInsightAction, SaveImageAction } from 'sql/parts/grid/views/query/chartViewerActions'; -import * as WorkbenchUtils from 'sql/workbench/common/sqlWorkbenchUtils'; -import * as Constants from 'sql/parts/query/common/constants'; -import { SelectBox as AngularSelectBox } from 'sql/base/browser/ui/selectBox/selectBox.component'; -import { IQueryModelService } from 'sql/parts/query/execution/queryModel'; -import { IClipboardService } from 'sql/platform/clipboard/common/clipboardService'; -import { LegendPosition, DataDirection, DataType } from 'sql/parts/dashboard/widgets/insights/views/charts/interfaces'; - -/* Insights */ -import { - ChartInsight -} from 'sql/parts/dashboard/widgets/insights/views/charts/chartInsight.component'; - -import { IDisposable } from 'vs/base/common/lifecycle'; -import Severity from 'vs/base/common/severity'; -import URI from 'vs/base/common/uri'; -import * as nls from 'vs/nls'; -import { Registry } from 'vs/platform/registry/common/platform'; -import { mixin } from 'vs/base/common/objects'; -import * as paths from 'vs/base/common/paths'; -import * as pfs from 'vs/base/node/pfs'; -import { ISelectData } from 'vs/base/browser/ui/selectBox/selectBox'; -import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; -import { INotificationService } from 'vs/platform/notification/common/notification'; -import { IContextMenuService } from 'vs/platform/contextview/browser/contextView'; -import { IConfigurationService } from 'vs/platform/configuration/common/configuration'; -import { IWindowsService, IWindowService } from 'vs/platform/windows/common/windows'; -import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace'; -import { IEditorService } from 'vs/workbench/services/editor/common/editorService'; - -const insightRegistry = Registry.as(Extensions.InsightContribution); - -const LocalizedStrings = { - CHART_TYPE: nls.localize('chartTypeLabel', 'Chart Type'), - DATA_DIRECTION: nls.localize('dataDirectionLabel', 'Data Direction'), - VERTICAL: nls.localize('verticalLabel', 'Vertical'), - HORIZONTAL: nls.localize('horizontalLabel', 'Horizontal'), - DATA_TYPE: nls.localize('dataTypeLabel', 'Data Type'), - NUMBER: nls.localize('numberLabel', 'Number'), - POINT: nls.localize('pointLabel', 'Point'), - LABEL_FIRST_COLUMN: nls.localize('labelFirstColumnLabel', 'Use first column as row label'), - COLUMNS_AS_LABELS: nls.localize('columnsAsLabelsLabel', 'Use column names as labels'), - LEGEND: nls.localize('legendLabel', 'Legend Position'), - CHART_NOT_FOUND: nls.localize('chartNotFound', 'Could not find chart to save'), - X_AXIS_LABEL: nls.localize('xAxisLabel', 'X Axis Label'), - X_AXIS_MIN_VAL: nls.localize('xAxisMinVal', 'X Axis Minimum Value'), - X_AXIS_MAX_VAL: nls.localize('xAxisMaxVal', 'X Axis Maximum Value'), - Y_AXIS_LABEL: nls.localize('yAxisLabel', 'Y Axis Label'), - Y_AXIS_MIN_VAL: nls.localize('yAxisMinVal', 'Y Axis Minimum Value'), - Y_AXIS_MAX_VAL: nls.localize('yAxisMaxVal', 'Y Axis Maximum Value') -}; - -@Component({ - selector: 'chart-viewer', - templateUrl: decodeURI(require.toUrl('sql/parts/grid/views/query/chartViewer.component.html')) -}) -export class ChartViewerComponent implements OnInit, OnDestroy, IChartViewActionContext { - public legendOptions: string[]; - @ViewChild('chartTypeSelect') private chartTypesSelectBox: AngularSelectBox; - - /* UI */ - - private _actionBar: Taskbar; - private _createInsightAction: CreateInsightAction; - private _copyAction: CopyAction; - private _saveAction: SaveImageAction; - private _chartConfig: ILineConfig; - private _disposables: Array = []; - private _executeResult: IInsightData; - private _chartComponent: ChartInsight; - - protected localizedStrings = LocalizedStrings; - protected insightRegistry = insightRegistry; - - @ViewChild(ComponentHostDirective) private componentHost: ComponentHostDirective; - @ViewChild('taskbarContainer', { read: ElementRef }) private taskbarContainer; - - constructor( - @Inject(forwardRef(() => ComponentFactoryResolver)) private _componentFactoryResolver: ComponentFactoryResolver, - @Inject(forwardRef(() => ChangeDetectorRef)) private _cd: ChangeDetectorRef, - @Inject(IInstantiationService) private instantiationService: IInstantiationService, - @Inject(INotificationService) private notificationService: INotificationService, - @Inject(IContextMenuService) private contextMenuService: IContextMenuService, - @Inject(IClipboardService) private clipboardService: IClipboardService, - @Inject(IConfigurationService) private configurationService: IConfigurationService, - @Inject(IWindowsService) private windowsService: IWindowsService, - @Inject(IWorkspaceContextService) private workspaceContextService: IWorkspaceContextService, - @Inject(IWindowService) private windowService: IWindowService, - @Inject(IQueryModelService) private queryModelService: IQueryModelService, - @Inject(IEditorService) private editorService: IEditorService - ) { - this.setDefaultChartConfig(); - } - - ngOnInit() { - this.legendOptions = Object.values(LegendPosition); - this._initActionBar(); - } - - private setDefaultChartConfig() { - let defaultChart = this.getDefaultChartType(); - if (defaultChart === 'timeSeries') { - this._chartConfig = { - dataDirection: 'vertical', - dataType: 'point', - legendPosition: 'none' - }; - } else { - this._chartConfig = { - dataDirection: 'vertical', - dataType: 'number', - legendPosition: 'none' - }; - } - } - - protected getDefaultChartType(): string { - let defaultChartType = Constants.chartTypeHorizontalBar; - if (this.configurationService) { - let chartSettings = WorkbenchUtils.getSqlConfigSection(this.configurationService, 'chart'); - // Only use the value if it's a known chart type. Ideally could query this dynamically but can't figure out how - if (chartSettings && Constants.allChartTypes.indexOf(chartSettings[Constants.defaultChartType]) > -1) { - defaultChartType = chartSettings[Constants.defaultChartType]; - } - } - return defaultChartType; - } - - private _initActionBar() { - this._createInsightAction = this.instantiationService.createInstance(CreateInsightAction); - this._copyAction = this.instantiationService.createInstance(CopyAction); - this._saveAction = this.instantiationService.createInstance(SaveImageAction); - - let taskbar = this.taskbarContainer.nativeElement; - this._actionBar = new Taskbar(taskbar, this.contextMenuService); - this._actionBar.context = this; - this._actionBar.setContent([ - { action: this._createInsightAction }, - { action: this._copyAction }, - { action: this._saveAction } - ]); - } - - public onChartChanged(e: ISelectData): void { - this.setDefaultChartConfig(); - if ([Constants.chartTypeScatter, Constants.chartTypeTimeSeries].some(item => item === e.selected)) { - this.dataType = DataType.Point; - this.dataDirection = DataDirection.Horizontal; - } - this.initChart(); - } - - ngAfterViewInit() { - this.initChart(); - } - - setConfigValue(key: string, value: any, refresh = true): void { - this._chartConfig[key] = value; - if (refresh) { - this.initChart(); - } - } - - public set dataType(type: DataType) { - this._chartConfig.dataType = type; - // Requires full chart refresh - this.initChart(); - } - - public set dataDirection(direction: DataDirection) { - this._chartConfig.dataDirection = direction; - // Requires full chart refresh - this.initChart(); - } - - public copyChart(): void { - let data = this._chartComponent.getCanvasData(); - if (!data) { - this.showError(LocalizedStrings.CHART_NOT_FOUND); - return; - } - - this.clipboardService.writeImageDataUrl(data); - } - - public saveChart(): void { - this.promptForFilepath().then(filePath => { - let data = this._chartComponent.getCanvasData(); - if (!data) { - this.showError(LocalizedStrings.CHART_NOT_FOUND); - return; - } - if (filePath) { - let buffer = this.decodeBase64Image(data); - pfs.writeFile(filePath, buffer).then(undefined, (err) => { - if (err) { - this.showError(err.message); - } else { - let fileUri = URI.from({ scheme: PathUtilities.FILE_SCHEMA, path: filePath }); - this.windowsService.openExternal(fileUri.toString()); - this.notificationService.notify({ - severity: Severity.Error, - message: nls.localize('chartSaved', 'Saved Chart to path: {0}', filePath) - }); - } - }); - } - }); - } - - private promptForFilepath(): Thenable { - let filepathPlaceHolder = PathUtilities.resolveCurrentDirectory(this.getActiveUriString(), PathUtilities.getRootPath(this.workspaceContextService)); - filepathPlaceHolder = paths.join(filepathPlaceHolder, 'chart.png'); - return this.windowService.showSaveDialog({ - title: nls.localize('chartViewer.saveAsFileTitle', 'Choose Results File'), - defaultPath: paths.normalize(filepathPlaceHolder, true) - }); - } - - private decodeBase64Image(data: string): Buffer { - let matches = data.match(/^data:([A-Za-z-+\/]+);base64,(.+)$/); - return new Buffer(matches[2], 'base64'); - } - - public createInsight(): void { - let uriString: string = this.getActiveUriString(); - if (!uriString) { - this.showError(nls.localize('createInsightNoEditor', 'Cannot create insight as the active editor is not a SQL Editor')); - return; - } - - let uri: URI = URI.parse(uriString); - let dataService = this.queryModelService.getDataService(uriString); - if (!dataService) { - this.showError(nls.localize('createInsightNoDataService', 'Cannot create insight, backing data model not found')); - return; - } - let queryFile: string = uri.fsPath; - let query: string = undefined; - let type = {}; - type[this.chartTypesSelectBox.value] = this._chartConfig; - // create JSON - let config: IInsightsConfig = { - type, - query, - queryFile - }; - - let widgetConfig = { - name: nls.localize('myWidgetName', 'My-Widget'), - gridItemConfig: this.getGridItemConfig(), - widget: { - 'insights-widget': config - } - }; - - // open in new window as untitled JSON file - dataService.openLink(JSON.stringify(widgetConfig), 'Insight', 'json'); - } - - private showError(errorMsg: string) { - this.notificationService.notify({ - severity: Severity.Error, - message: errorMsg - }); - } - - private getGridItemConfig(): NgGridItemConfig { - let config: NgGridItemConfig = { - sizex: 2, - sizey: 1 - }; - return config; - } - - private getActiveUriString(): string { - let editorService = this.editorService; - let editor = editorService.activeControl; - if (editor && editor instanceof QueryEditor) { - let queryEditor: QueryEditor = editor; - return queryEditor.uri; - } - return undefined; - } - - protected get showDataDirection(): boolean { - return ['pie', 'horizontalBar', 'bar', 'doughnut'].some(item => item === this.chartTypesSelectBox.value) || (this.chartTypesSelectBox.value === 'line' && this.dataType === 'number'); - } - - protected get showLabelFirstColumn(): boolean { - return this.dataDirection === 'horizontal' && this.dataType !== 'point'; - } - - protected get showColumnsAsLabels(): boolean { - return this.dataDirection === 'vertical' && this.dataType !== 'point'; - } - - public get dataDirection(): DataDirection { - return this._chartConfig.dataDirection; - } - - public get dataType(): DataType { - return this._chartConfig.dataType; - } - - @Input() set dataSet(dataSet: IGridDataSet) { - // Setup the execute result - this._executeResult = {}; - - // Remove first column and its value since this is the row number column - this._executeResult.columns = dataSet.columnDefinitions.slice(1).map(def => def.name); - this._executeResult.rows = dataSet.dataRows.getRange(0, dataSet.dataRows.getLength()).map(v => { - return this._executeResult.columns.reduce((p, c) => { - p.push(v[c]); - return p; - }, []); - }); - } - - - public initChart() { - this._cd.detectChanges(); - if (this._executeResult) { - // Reinitialize the chart component - let componentFactory = this._componentFactoryResolver.resolveComponentFactory(insightRegistry.getCtorFromId(this.chartTypesSelectBox.value)); - this.componentHost.viewContainerRef.clear(); - let componentRef = this.componentHost.viewContainerRef.createComponent(componentFactory); - this._chartComponent = componentRef.instance; - if (this._chartComponent.setConfig) { - this._chartComponent.setConfig(this._chartConfig); - } - this._chartComponent.data = this._executeResult; - this._chartComponent.options = mixin(this._chartComponent.options, { animation: { duration: 0 } }); - if (this._chartComponent.init) { - this._chartComponent.init(); - } - } - } - - ngOnDestroy() { - this._disposables.forEach(i => i.dispose()); - } -} diff --git a/src/sql/parts/grid/views/query/chartViewer.css b/src/sql/parts/grid/views/query/chartViewer.css deleted file mode 100644 index 4887c2fb55..0000000000 --- a/src/sql/parts/grid/views/query/chartViewer.css +++ /dev/null @@ -1,56 +0,0 @@ - -input[type="radio"] { - margin-top: -2px; - vertical-align: middle; -} - -.chart-viewer { - overflow-y: auto; -} -.chart-viewer .indent { - margin-left: 7px; -} - -.chart-viewer .radio-indent { - margin-left: 5px; -} - -.chart-viewer .option { - width: 100%; - padding-bottom: 7px; -} - -.chart-viewer .dialog-label { - width: 100%; - padding-bottom: 5px; -} - -.chart-viewer .input-divider { - width: 100%; - padding-bottom: 20px; -} - -.chart-viewer .footer { - display: flex; -} - -.chart-viewer .footer .right-footer { - display: flex; - flex: 1 1 auto; - justify-content: flex-end; -} - -.chart-viewer .footer-button a.monaco-button.monaco-text-button { - width: 100px; -} - -.vs-dark.monaco-shell .chart-viewer .footer-button a.monaco-button.monaco-text-button { - outline-color: #8e8c8c; -} -.chart-viewer .footer-button { - margin-right: 5px; -} - -.chart-viewer .right-footer .footer-button:last-of-type { - margin-right: none; -} \ No newline at end of file diff --git a/src/sql/parts/grid/views/query/chartViewerActions.ts b/src/sql/parts/grid/views/query/chartViewerActions.ts deleted file mode 100644 index 8ff1952abe..0000000000 --- a/src/sql/parts/grid/views/query/chartViewerActions.ts +++ /dev/null @@ -1,108 +0,0 @@ -/*--------------------------------------------------------------------------------------------- - * Copyright (c) Microsoft Corporation. All rights reserved. - * Licensed under the Source EULA. See License.txt in the project root for license information. - *--------------------------------------------------------------------------------------------*/ - -import { TPromise } from 'vs/base/common/winjs.base'; -import { Action } from 'vs/base/common/actions'; -import * as nls from 'vs/nls'; -import { INotificationService } from 'vs/platform/notification/common/notification'; -import Severity from 'vs/base/common/severity'; - -export interface IChartViewActionContext { - copyChart(): void; - saveChart(): void; - createInsight(): void; -} - -export class ChartViewActionBase extends Action { - public static BaseClass = 'queryTaskbarIcon'; - private _classes: string[]; - - constructor( - id: string, - label: string, - enabledClass: string, - protected notificationService: INotificationService - ) { - super(id, label); - this.enabled = true; - this._setCssClass(enabledClass); - } - protected updateCssClass(enabledClass: string): void { - // set the class, useful on change of label or icon - this._setCssClass(enabledClass); - } - - /** - * Sets the CSS classes combining the parent and child classes. - * Public for testing only. - */ - private _setCssClass(enabledClass: string): void { - this._classes = []; - this._classes.push(ChartViewActionBase.BaseClass); - - if (enabledClass) { - this._classes.push(enabledClass); - } - this.class = this._classes.join(' '); - } - - protected doRun(context: IChartViewActionContext, runAction: Function): TPromise { - if (!context) { - // TODO implement support for finding chart view in active window - this.notificationService.notify({ - severity: Severity.Error, - message: nls.localize('chartContextRequired', 'Chart View context is required to run this action') - }); - return TPromise.as(false); - } - return new TPromise((resolve, reject) => { - runAction(); - resolve(true); - }); - } - -} - -export class CreateInsightAction extends ChartViewActionBase { - public static ID = 'chartview.createInsight'; - public static LABEL = nls.localize('createInsightLabel', "Create Insight"); - - constructor(@INotificationService notificationService: INotificationService - ) { - super(CreateInsightAction.ID, CreateInsightAction.LABEL, 'createInsight', notificationService); - } - - public run(context: IChartViewActionContext): TPromise { - return this.doRun(context, () => context.createInsight()); - } -} - -export class CopyAction extends ChartViewActionBase { - public static ID = 'chartview.copy'; - public static LABEL = nls.localize('copyChartLabel', "Copy as image"); - - constructor(@INotificationService notificationService: INotificationService - ) { - super(CopyAction.ID, CopyAction.LABEL, 'copyImage', notificationService); - } - - public run(context: IChartViewActionContext): TPromise { - return this.doRun(context, () => context.copyChart()); - } -} - -export class SaveImageAction extends ChartViewActionBase { - public static ID = 'chartview.saveImage'; - public static LABEL = nls.localize('saveImageLabel', "Save as image"); - - constructor(@INotificationService notificationService: INotificationService - ) { - super(SaveImageAction.ID, SaveImageAction.LABEL, 'saveAsImage', notificationService); - } - - public run(context: IChartViewActionContext): TPromise { - return this.doRun(context, () => context.saveChart()); - } -} \ No newline at end of file diff --git a/src/sql/parts/grid/views/query/query.component.html b/src/sql/parts/grid/views/query/query.component.html deleted file mode 100644 index 26ea906cd3..0000000000 --- a/src/sql/parts/grid/views/query/query.component.html +++ /dev/null @@ -1,82 +0,0 @@ - - -
- -
-
- - - -
-
- - -
-
- -
-
- -
-
- - - - - - - - - - - - - - - - - - - - -
[{{message.time}}]{{message.message}} {{message.link.text}} -
[{{startString}}] - - {{LocalizedConstants.executeQueryLabel}} -
{{stringsFormat(LocalizedConstants.elapsedTimeLabel, totalElapsedTimeSpan)}}
-
-
-
\ No newline at end of file diff --git a/src/sql/parts/grid/views/query/query.component.ts b/src/sql/parts/grid/views/query/query.component.ts deleted file mode 100644 index db9a1bf78b..0000000000 --- a/src/sql/parts/grid/views/query/query.component.ts +++ /dev/null @@ -1,732 +0,0 @@ -/*--------------------------------------------------------------------------------------------- - * Copyright (c) Microsoft Corporation. All rights reserved. - * Licensed under the Source EULA. See License.txt in the project root for license information. - *--------------------------------------------------------------------------------------------*/ - -'use strict'; -import 'vs/css!sql/media/icons/common-icons'; -import 'vs/css!sql/parts/grid/media/slickColorTheme'; -import 'vs/css!sql/parts/grid/media/flexbox'; -import 'vs/css!sql/parts/grid/media/styles'; -import 'vs/css!sql/parts/grid/media/slick.grid'; -import 'vs/css!sql/parts/grid/media/slickGrid'; - -import { - ElementRef, QueryList, ChangeDetectorRef, OnInit, OnDestroy, Component, Inject, - ViewChildren, forwardRef, EventEmitter, Input, ViewChild -} from '@angular/core'; -import { IGridDataRow, SlickGrid, VirtualizedCollection } from 'angular2-slickgrid'; - -import * as LocalizedConstants from 'sql/parts/query/common/localizedConstants'; -import * as Services from 'sql/parts/grid/services/sharedServices'; -import { IGridIcon, IMessage, IGridDataSet } from 'sql/parts/grid/common/interfaces'; -import { GridParentComponent } from 'sql/parts/grid/views/gridParentComponent'; -import { GridActionProvider } from 'sql/parts/grid/views/gridActions'; -import { IQueryComponentParams } from 'sql/services/bootstrap/bootstrapParams'; -import { error } from 'sql/base/common/log'; -import { TabChild } from 'sql/base/browser/ui/panel/tab.component'; -import { clone, mixin } from 'sql/base/common/objects'; -import { IQueryEditorService } from 'sql/parts/query/common/queryEditorService'; -import { escape } from 'sql/base/common/strings'; -import { RowNumberColumn } from 'sql/base/browser/ui/table/plugins/rowNumberColumn.plugin'; -import { AutoColumnSize } from 'sql/base/browser/ui/table/plugins/autoSizeColumns.plugin'; -import { AdditionalKeyBindings } from 'sql/base/browser/ui/table/plugins/additionalKeyBindings.plugin'; - -import { format } from 'vs/base/common/strings'; -import * as DOM from 'vs/base/browser/dom'; -import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent'; -import { KeyCode } from 'vs/base/common/keyCodes'; -import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; -import { IContextMenuService } from 'vs/platform/contextview/browser/contextView'; -import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding'; -import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey'; -import { IConfigurationService } from 'vs/platform/configuration/common/configuration'; -import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService'; -import { INotificationService } from 'vs/platform/notification/common/notification'; -import { localize } from 'vs/nls'; - -export const QUERY_SELECTOR: string = 'query-component'; - -declare type PaneType = 'messages' | 'results'; - -@Component({ - selector: QUERY_SELECTOR, - host: { '(window:keydown)': 'keyEvent($event)', '(window:gridnav)': 'keyEvent($event)' }, - templateUrl: decodeURI(require.toUrl('sql/parts/grid/views/query/query.component.html')), - providers: [{ provide: TabChild, useExisting: forwardRef(() => QueryComponent) }] -}) -export class QueryComponent extends GridParentComponent implements OnInit, OnDestroy { - // CONSTANTS - // tslint:disable-next-line:no-unused-variable - private scrollTimeOutTime: number = 200; - private windowSize: number = 50; - private messagePaneHeight: number = 22; - // tslint:disable-next-line:no-unused-variable - private maxScrollGrids: number = 8; - - // create a function alias to use inside query.component - // tslint:disable-next-line:no-unused-variable - protected stringsFormat: any = format; - - protected plugins = new Array>>(); - - // tslint:disable-next-line:no-unused-variable - private dataIcons: IGridIcon[] = [ - { - showCondition: () => { return this.dataSets.length > 1; }, - icon: () => { - return this.renderedDataSets.length === 1 - ? 'exitFullScreen' - : 'extendFullScreen'; - }, - hoverText: () => { - return this.renderedDataSets.length === 1 - ? LocalizedConstants.restoreLabel - : LocalizedConstants.maximizeLabel; - }, - functionality: (batchId, resultId, index) => { - this.magnify(index); - } - }, - { - showCondition: () => { return true; }, - icon: () => { return 'saveCsv'; }, - hoverText: () => { return LocalizedConstants.saveCSVLabel; }, - functionality: (batchId, resultId, index) => { - let selection = this.getSelection(index); - if (selection.length <= 1) { - this.handleContextClick({ type: 'savecsv', batchId: batchId, resultId: resultId, index: index, selection: selection }); - } else { - this.dataService.showWarning(LocalizedConstants.msgCannotSaveMultipleSelections); - } - } - }, - { - showCondition: () => { return true; }, - icon: () => { return 'saveJson'; }, - hoverText: () => { return LocalizedConstants.saveJSONLabel; }, - functionality: (batchId, resultId, index) => { - let selection = this.getSelection(index); - if (selection.length <= 1) { - this.handleContextClick({ type: 'savejson', batchId: batchId, resultId: resultId, index: index, selection: selection }); - } else { - this.dataService.showWarning(LocalizedConstants.msgCannotSaveMultipleSelections); - } - } - }, - { - showCondition: () => { return true; }, - icon: () => { return 'saveExcel'; }, - hoverText: () => { return LocalizedConstants.saveExcelLabel; }, - functionality: (batchId, resultId, index) => { - let selection = this.getSelection(index); - if (selection.length <= 1) { - this.handleContextClick({ type: 'saveexcel', batchId: batchId, resultId: resultId, index: index, selection: selection }); - } else { - this.dataService.showWarning(LocalizedConstants.msgCannotSaveMultipleSelections); - } - } - }, - { - showCondition: () => { return true; }, - icon: () => { return 'saveXml'; }, - hoverText: () => { return LocalizedConstants.saveXMLLabel; }, - functionality: (batchId, resultId, index) => { - let selection = this.getSelection(index); - if (selection.length <= 1) { - this.handleContextClick({ type: 'savexml', batchId: batchId, resultId: resultId, index: index, selection: selection }); - } else { - this.dataService.showWarning(LocalizedConstants.msgCannotSaveMultipleSelections); - } - } - }, - { - showCondition: () => { - return this.configurationService.getValue('workbench')['enablePreviewFeatures']; - }, - icon: () => { return 'viewChart'; }, - hoverText: () => { return LocalizedConstants.viewChartLabel; }, - functionality: (batchId, resultId, index) => { - this.showChartForGrid(index); - } - } - ]; - - // FIELDS - // Service for interaction with the IQueryModel - - // All datasets - private dataSets: IGridDataSet[] = []; - private messages: IMessage[] = []; - private messageStore: IMessage[] = []; - private messageTimeout: number; - private lastMessageHandleTime: number = 0; - private scrollTimeOut: number; - private resizing = false; - private resizeHandleTop: string = '0'; - private scrollEnabled = true; - private rowHeight: number; - // tslint:disable-next-line:no-unused-variable - private firstRender = true; - private totalElapsedTimeSpan: number; - private complete = false; - private sentPlans: Map = new Map(); - private hasQueryPlan: boolean = false; - private queryPlanResultSetId: number = 0; - public queryExecutionStatus: EventEmitter = new EventEmitter(); - public queryPlanAvailable: EventEmitter = new EventEmitter(); - public showChartRequested: EventEmitter = new EventEmitter(); - public goToNextQueryOutputTabRequested: EventEmitter = new EventEmitter(); - public onActiveCellChanged: (gridIndex: number) => void; - - private savedViewState: { - gridSelections: Slick.Range[][]; - resultsScroll: number; - messagePaneScroll: number; - slickGridScrolls: { vertical: number; horizontal: number }[]; - }; - - @Input() public queryParameters: IQueryComponentParams; - - @ViewChildren('slickgrid') slickgrids: QueryList; - // tslint:disable-next-line:no-unused-variable - @ViewChild('resultsPane', { read: ElementRef }) private _resultsPane: ElementRef; - @ViewChild('queryLink', { read: ElementRef }) private _queryLinkElement: ElementRef; - @ViewChild('messagesContainer', { read: ElementRef }) private _messagesContainer: ElementRef; - @ViewChild('resultsScrollBox', { read: ElementRef }) private _resultsScrollBox: ElementRef; - @ViewChildren('slickgrid', { read: ElementRef }) private _slickgridElements: QueryList; - constructor( - @Inject(forwardRef(() => ElementRef)) el: ElementRef, - @Inject(forwardRef(() => ChangeDetectorRef)) cd: ChangeDetectorRef, - @Inject(IInstantiationService) private instantiationService: IInstantiationService, - @Inject(IContextMenuService) contextMenuService: IContextMenuService, - @Inject(IKeybindingService) keybindingService: IKeybindingService, - @Inject(IContextKeyService) contextKeyService: IContextKeyService, - @Inject(IConfigurationService) configurationService: IConfigurationService, - @Inject(IClipboardService) clipboardService: IClipboardService, - @Inject(IQueryEditorService) queryEditorService: IQueryEditorService, - @Inject(INotificationService) notificationService: INotificationService, - ) { - super(el, cd, contextMenuService, keybindingService, contextKeyService, configurationService, clipboardService, queryEditorService, notificationService); - this._el.nativeElement.className = 'slickgridContainer'; - this.rowHeight = configurationService.getValue('resultsGrid').rowHeight; - configurationService.onDidChangeConfiguration(e => { - if (e.affectsConfiguration('resultsGrid')) { - this.rowHeight = configurationService.getValue('resultsGrid').rowHeight; - this.slickgrids.forEach(i => { - i.rowHeight = this.rowHeight; - }); - this.resizeGrids(); - } - }); - } - - /** - * Called by Angular when the object is initialized - */ - ngOnInit(): void { - const self = this; - - this.dataService = this.queryParameters.dataService; - this.actionProvider = this.instantiationService.createInstance(GridActionProvider, this.dataService, this.onGridSelectAll()); - - this.baseInit(); - this.setupResizeBind(); - - this.subscribeWithDispose(this.dataService.queryEventObserver, (event) => { - switch (event.type) { - case 'start': - self.handleStart(self, event); - break; - case 'complete': - self.handleComplete(self, event); - break; - case 'message': - self.handleMessage(self, event); - break; - case 'resultSet': - self.handleResultSet(self, event); - break; - default: - error('Unexpected query event type "' + event.type + '" sent'); - break; - } - self._cd.detectChanges(); - }); - - this.queryParameters.onSaveViewState(() => this.saveViewState()); - this.queryParameters.onRestoreViewState(() => this.restoreViewState()); - - this.dataService.onAngularLoaded(); - } - - public ngOnDestroy(): void { - this.baseDestroy(); - } - - protected initShortcuts(shortcuts: { [name: string]: Function }): void { - shortcuts['event.nextGrid'] = () => { - this.navigateToGrid(this.activeGrid + 1); - }; - shortcuts['event.prevGrid'] = () => { - this.navigateToGrid(this.activeGrid - 1); - }; - shortcuts['event.maximizeGrid'] = () => { - this.magnify(this.activeGrid); - }; - } - - handleStart(self: QueryComponent, event: any): void { - self.messages = []; - self.dataSets = []; - self.placeHolderDataSets = []; - self.renderedDataSets = self.placeHolderDataSets; - self.totalElapsedTimeSpan = undefined; - self.complete = false; - self.activeGrid = 0; - - this.onActiveCellChanged = this.onCellSelect; - - // reset query plan info and send notification to subscribers - self.hasQueryPlan = false; - self.sentPlans = new Map(); - self.queryExecutionStatus.emit('start'); - self.firstRender = true; - } - - handleComplete(self: QueryComponent, event: any): void { - self.totalElapsedTimeSpan = event.data; - self.complete = true; - } - - handleMessage(self: QueryComponent, event: any): void { - self.messageStore.push(event.data); - // Ensure that messages are updated at least every 10 seconds during long-running queries - if (self.messageTimeout !== undefined && Date.now() - self.lastMessageHandleTime < 10000) { - clearTimeout(self.messageTimeout); - } else { - self.lastMessageHandleTime = Date.now(); - } - self.messageTimeout = setTimeout(() => { - while (self.messageStore.length > 0) { - let lastMessage = self.messages.length > 0 ? self.messages[self.messages.length - 1] : undefined; - let nextMessage = self.messageStore[0]; - // If the next message has the same metadata as the previous one, just append its text to avoid rendering an entirely new message - if (lastMessage !== undefined && lastMessage.batchId === nextMessage.batchId && lastMessage.isError === nextMessage.isError - && lastMessage.link === nextMessage.link && lastMessage.link === undefined) { - lastMessage.message += '\n' + nextMessage.message; - } else { - self.messages.push(nextMessage); - } - self.messageStore = self.messageStore.slice(1); - } - self._cd.detectChanges(); - self.scrollMessages(); - }, 100); - } - - handleResultSet(self: QueryComponent, event: any): void { - let resultSet = event.data; - - // No column info found, so define a column of no name by default - if (!resultSet.columnInfo) { - resultSet.columnInfo = []; - resultSet.columnInfo[0] = { columnName: '' }; - } - // Setup a function for generating a promise to lookup result subsets - let loadDataFunction = (offset: number, count: number): Promise => { - return new Promise((resolve, reject) => { - self.dataService.getQueryRows(offset, count, resultSet.batchId, resultSet.id).subscribe(rows => { - let gridData: IGridDataRow[] = []; - for (let row = 0; row < rows.rows.length; row++) { - // Push row values onto end of gridData for slickgrid - gridData.push({ - values: [{}].concat(rows.rows[row].map(c => { - return mixin({ ariaLabel: escape(c.displayValue) }, c); - })) - }); - } - - // if this is a query plan resultset we haven't processed yet then forward to subscribers - if (self.hasQueryPlan && resultSet.id === self.queryPlanResultSetId && !self.sentPlans[resultSet.id]) { - self.sentPlans[resultSet.id] = rows.rows[0][0].displayValue; - self.queryPlanAvailable.emit(rows.rows[0][0].displayValue); - } - resolve(gridData); - }); - }); - }; - - // Precalculate the max height and min height - let maxHeight: string = 'inherit'; - if (resultSet.rowCount < self._defaultNumShowingRows) { - let maxHeightNumber: number = Math.max((resultSet.rowCount + 1) * self._rowHeight, self.dataIcons.length * 30) + 10; - maxHeight = maxHeightNumber.toString() + 'px'; - } - - let minHeight: string = maxHeight; - if (resultSet.rowCount >= self._defaultNumShowingRows) { - let minHeightNumber: number = (self._defaultNumShowingRows + 1) * self._rowHeight + 10; - minHeight = minHeightNumber.toString() + 'px'; - } - - let rowNumberColumn = new RowNumberColumn({ numberOfRows: resultSet.rowCount }); - - // Store the result set from the event - let dataSet: IGridDataSet = { - resized: undefined, - batchId: resultSet.batchId, - resultId: resultSet.id, - totalRows: resultSet.rowCount, - maxHeight: maxHeight, - minHeight: minHeight, - dataRows: new VirtualizedCollection( - self.windowSize, - resultSet.rowCount, - loadDataFunction, - index => { return { values: [] }; } - ), - columnDefinitions: [rowNumberColumn.getColumnDefinition()].concat(resultSet.columnInfo.map((c, i) => { - let isLinked = c.isXml || c.isJson; - let linkType = c.isXml ? 'xml' : 'json'; - - return { - id: i.toString(), - name: c.columnName === 'Microsoft SQL Server 2005 XML Showplan' - ? 'XML Showplan' - : escape(c.columnName), - field: i.toString(), - formatter: isLinked ? Services.hyperLinkFormatter : Services.textFormatter, - asyncPostRender: isLinked ? self.linkHandler(linkType) : undefined - }; - })) - }; - self.plugins.push([rowNumberColumn, new AutoColumnSize(), new AdditionalKeyBindings()]); - self.dataSets.push(dataSet); - - // check if the resultset is for a query plan - for (let i = 0; i < resultSet.columnInfo.length; ++i) { - let column = resultSet.columnInfo[i]; - if (column.columnName === 'Microsoft SQL Server 2005 XML Showplan') { - this.hasQueryPlan = true; - this.queryPlanResultSetId = resultSet.id; - break; - } - } - - // Create a dataSet to render without rows to reduce DOM size - let undefinedDataSet = clone(dataSet); - undefinedDataSet.columnDefinitions = dataSet.columnDefinitions; - undefinedDataSet.dataRows = undefined; - undefinedDataSet.resized = new EventEmitter(); - self.placeHolderDataSets.push(undefinedDataSet); - self.onScroll(0); - } - - onCellSelect(gridIndex: number): void { - this.activeGrid = gridIndex; - } - - openMessagesContextMenu(event: any): void { - let self = this; - event.preventDefault(); - let selectedRange = this.getSelectedRangeUnderMessages(); - let selectAllFunc = () => self.selectAllMessages(); - let anchor = { x: event.x + 1, y: event.y }; - this.contextMenuService.showContextMenu({ - getAnchor: () => anchor, - getActions: () => this.actionProvider.getMessagesActions(this.dataService, selectAllFunc), - getKeyBinding: (action) => this._keybindingFor(action), - onHide: (wasCancelled?: boolean) => { - }, - getActionsContext: () => (selectedRange) - }); - } - - - /** - * Handles rendering the results to the DOM that are currently being shown - * and destroying any results that have moved out of view - * @param scrollTop The scrolltop value, if not called by the scroll event should be 0 - */ - onScroll(scrollTop): void { - const self = this; - clearTimeout(self.scrollTimeOut); - this.scrollTimeOut = setTimeout(() => { - if (self.dataSets.length < self.maxScrollGrids) { - self.scrollEnabled = false; - for (let i = 0; i < self.placeHolderDataSets.length; i++) { - self.placeHolderDataSets[i].dataRows = self.dataSets[i].dataRows; - self.placeHolderDataSets[i].resized.emit(); - } - } else { - let gridHeight = self._el.nativeElement.getElementsByTagName('slick-grid')[0].offsetHeight; - let tabHeight = self.getResultsElement().offsetHeight; - let numOfVisibleGrids = Math.ceil((tabHeight / gridHeight) - + ((scrollTop % gridHeight) / gridHeight)); - let min = Math.floor(scrollTop / gridHeight); - let max = min + numOfVisibleGrids; - for (let i = 0; i < self.placeHolderDataSets.length; i++) { - if (i >= min && i < max) { - if (self.placeHolderDataSets[i].dataRows === undefined) { - self.placeHolderDataSets[i].dataRows = self.dataSets[i].dataRows; - self.placeHolderDataSets[i].resized.emit(); - } - } else if (self.placeHolderDataSets[i].dataRows !== undefined) { - self.placeHolderDataSets[i].dataRows = undefined; - } - } - } - - self._cd.detectChanges(); - }, self.scrollTimeOutTime); - } - - onSelectionLinkClicked(index: number): void { - this.dataService.setEditorSelection(index); - } - - onKey(e: Event, index: number) { - if (DOM.isAncestor(e.target, this._queryLinkElement.nativeElement) && e instanceof KeyboardEvent) { - let event = new StandardKeyboardEvent(e); - if (event.equals(KeyCode.Enter)) { - this.onSelectionLinkClicked(index); - e.stopPropagation(); - } - } - } - - /** - * Sets up the resize for the messages/results panes bar - */ - setupResizeBind(): void { - const self = this; - - let resizeHandleElement: HTMLElement = self._el.nativeElement.querySelector('#messageResizeHandle'); - let $resizeHandle = $(resizeHandleElement); - let $messages = $(self.getMessagesElement()); - - $resizeHandle.bind('dragstart', (e) => { - self.resizing = true; - self.resizeHandleTop = self.calculateResizeHandleTop(e.pageY); - self._cd.detectChanges(); - return true; - }); - - $resizeHandle.bind('drag', (e) => { - // Update the animation if the drag is within the allowed range. - if (self.isDragWithinAllowedRange(e.pageY, resizeHandleElement)) { - self.resizeHandleTop = self.calculateResizeHandleTop(e.pageY); - self.resizing = true; - self._cd.detectChanges(); - - // Stop the animation if the drag is out of the allowed range. - // The animation is resumed when the drag comes back into the allowed range. - } else { - self.resizing = false; - } - }); - - $resizeHandle.bind('dragend', (e) => { - self.resizing = false; - // Redefine the min size for the messages based on the final position - // if the drag is within the allowed rang - if (self.isDragWithinAllowedRange(e.pageY, resizeHandleElement)) { - let minHeightNumber = this.getMessagePaneHeightFromDrag(e.pageY); - $messages.css('min-height', minHeightNumber + 'px'); - self._cd.detectChanges(); - self.resizeGrids(); - - // Otherwise just update the UI to show that the drag is complete - } else { - self._cd.detectChanges(); - } - }); - } - - /** - * Returns true if the resize of the messagepane given by the drag at top=eventPageY is valid, - * false otherwise. A drag is valid if it is below the bottom of the resultspane and - * this.messagePaneHeight pixels above the bottom of the entire angular component. - */ - isDragWithinAllowedRange(eventPageY: number, resizeHandle: HTMLElement): boolean { - let resultspaneElement: HTMLElement = this._el.nativeElement.querySelector('#resultspane'); - let minHeight = this.getMessagePaneHeightFromDrag(eventPageY); - - if (resultspaneElement && - minHeight > 0 && - resultspaneElement.getBoundingClientRect().bottom < eventPageY - ) { - return true; - } - return false; - } - - /** - * Calculates the position of the top of the resize handle given the Y-axis drag - * coordinate as eventPageY. - */ - calculateResizeHandleTop(eventPageY: number): string { - let resultsWindowTop: number = this._el.nativeElement.getBoundingClientRect().top; - let relativeTop: number = eventPageY - resultsWindowTop; - return relativeTop + 'px'; - } - - /** - * Returns the height the message pane would be if it were resized so that its top would be set to eventPageY. - * This will return a negative value if eventPageY is below the bottom limit. - */ - getMessagePaneHeightFromDrag(eventPageY: number): number { - let bottomDragLimit: number = this._el.nativeElement.getBoundingClientRect().bottom - this.messagePaneHeight; - return bottomDragLimit - eventPageY; - } - - /** - * Ensures the messages tab is scrolled to the bottom - */ - scrollMessages(): void { - let messagesDiv = this.getMessagesElement(); - messagesDiv.scrollTop = messagesDiv.scrollHeight; - } - - /** - * - */ - protected tryHandleKeyEvent(e): boolean { - return false; - } - - /** - * Handles rendering and unrendering necessary resources in order to properly - * navigate from one grid another. Should be called any time grid navigation is performed - * @param targetIndex The index in the renderedDataSets to navigate to - * @returns A boolean representing if the navigation was successful - */ - navigateToGrid(targetIndex: number): boolean { - // check if the target index is valid - if (targetIndex >= this.renderedDataSets.length || !this.hasFocus()) { - return false; - } - - // Deselect any text since we are navigating to a new grid - // Do this even if not switching grids, since this covers clicking on the grid after message selection - window.getSelection().removeAllRanges(); - - // check if you are actually trying to change navigation - if (this.activeGrid === targetIndex) { - return false; - } - - this.slickgrids.toArray()[this.activeGrid].selection = false; - this.slickgrids.toArray()[targetIndex].setActive(); - this.activeGrid = targetIndex; - - // scrolling logic - let resultsWindow = $('#results'); - let scrollTop = resultsWindow.scrollTop(); - let scrollBottom = scrollTop + resultsWindow.height(); - let gridHeight = $(this._el.nativeElement).find('slick-grid').height(); - if (scrollBottom < gridHeight * (targetIndex + 1)) { - scrollTop += (gridHeight * (targetIndex + 1)) - scrollBottom; - resultsWindow.scrollTop(scrollTop); - } - if (scrollTop > gridHeight * targetIndex) { - scrollTop = (gridHeight * targetIndex); - resultsWindow.scrollTop(scrollTop); - } - - return true; - } - - public hasFocus(): boolean { - return DOM.isAncestor(document.activeElement, this._el.nativeElement); - } - - resizeGrids(): void { - const self = this; - setTimeout(() => { - for (let grid of self.renderedDataSets) { - grid.resized.emit(); - } - }); - } - - protected showChartForGrid(index: number) { - if (this.renderedDataSets.length > index) { - this.showChartRequested.emit(this.renderedDataSets[index]); - } - } - - protected goToNextQueryOutputTab(): void { - this.goToNextQueryOutputTabRequested.emit(); - } - - protected toggleResultPane(): void { - this.resultActive = !this.resultActive; - this._cd.detectChanges(); - if (this.resultActive) { - this.resizeGrids(); - this.slickgrids.toArray()[this.activeGrid].setActive(); - } - } - - protected toggleMessagePane(): void { - this.messageActive = !this.messageActive; - this._cd.detectChanges(); - if (this.messageActive && this._messagesContainer) { - let header = this._messagesContainer.nativeElement; - header.focus(); - } - } - - /* Helper function to toggle messages and results panes */ - // tslint:disable-next-line:no-unused-variable - private togglePane(pane: PaneType): void { - if (pane === 'messages') { - this.toggleMessagePane(); - } else if (pane === 'results') { - this.toggleResultPane(); - } - } - - private saveViewState(): void { - let gridSelections = this.slickgrids.map(grid => grid.getSelectedRanges()); - let resultsScrollElement = (this._resultsScrollBox.nativeElement as HTMLElement); - let resultsScroll = resultsScrollElement.scrollTop; - let messagePaneScroll = (this._messagesContainer.nativeElement as HTMLElement).scrollTop; - let slickGridScrolls = this._slickgridElements.map(element => { - // Get the slick grid's viewport element and save its scroll position - let scrollElement = (element.nativeElement as HTMLElement).children[0].children[3]; - return { - vertical: scrollElement.scrollTop, - horizontal: scrollElement.scrollLeft - }; - }); - - this.savedViewState = { - gridSelections, - messagePaneScroll, - resultsScroll, - slickGridScrolls - }; - } - - private restoreViewState(): void { - if (this.savedViewState) { - this.slickgrids.forEach((grid, index) => grid.selection = this.savedViewState.gridSelections[index]); - (this._resultsScrollBox.nativeElement as HTMLElement).scrollTop = this.savedViewState.resultsScroll; - (this._messagesContainer.nativeElement as HTMLElement).scrollTop = this.savedViewState.messagePaneScroll; - this._slickgridElements.forEach((element, index) => { - let scrollElement = (element.nativeElement as HTMLElement).children[0].children[3]; - let savedScroll = this.savedViewState.slickGridScrolls[index]; - scrollElement.scrollTop = savedScroll.vertical; - scrollElement.scrollLeft = savedScroll.horizontal; - }); - this.savedViewState = undefined; - } - } - - layout() { - this.resizeGrids(); - } -} diff --git a/src/sql/parts/insights/browser/insightsDialogView.ts b/src/sql/parts/insights/browser/insightsDialogView.ts index 34e4b69525..beb64b5000 100644 --- a/src/sql/parts/insights/browser/insightsDialogView.ts +++ b/src/sql/parts/insights/browser/insightsDialogView.ts @@ -5,12 +5,12 @@ import 'vs/css!sql/parts/insights/browser/media/insightsDialog'; import { Button } from 'sql/base/browser/ui/button/button'; -import { IConnectionProfile } from 'sql/parts/connection/common/interfaces'; +import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; import { Modal } from 'sql/base/browser/ui/modal/modal'; import { IInsightsConfigDetails } from 'sql/parts/dashboard/widgets/insights/interfaces'; import { attachButtonStyler, attachModalDialogStyler, attachTableStyler, attachPanelStyler } from 'sql/common/theme/styler'; import { TaskRegistry } from 'sql/platform/tasks/common/tasks'; -import { ConnectionProfile } from 'sql/parts/connection/common/connectionProfile'; +import { ConnectionProfile } from 'sql/platform/connection/common/connectionProfile'; import * as TelemetryKeys from 'sql/common/telemetryKeys'; import { IInsightsDialogModel, ListResource, IInsightDialogActionContext, insertValueRegex } from 'sql/parts/insights/common/interfaces'; import { TableDataView } from 'sql/base/browser/ui/table/tableDataView'; @@ -18,7 +18,7 @@ import { RowSelectionModel } from 'sql/base/browser/ui/table/plugins/rowSelectio import { error } from 'sql/base/common/log'; import { Table } from 'sql/base/browser/ui/table/table'; import { CopyInsightDialogSelectionAction } from 'sql/parts/insights/common/insightDialogActions'; -import { ICapabilitiesService } from 'sql/services/capabilities/capabilitiesService'; +import { ICapabilitiesService } from 'sql/platform/capabilities/common/capabilitiesService'; import { IClipboardService } from 'sql/platform/clipboard/common/clipboardService'; import { IDisposableDataProvider } from 'sql/base/browser/ui/table/interfaces'; diff --git a/src/sql/parts/insights/common/interfaces.ts b/src/sql/parts/insights/common/interfaces.ts index 7f9ba5294d..bc93aae7d4 100644 --- a/src/sql/parts/insights/common/interfaces.ts +++ b/src/sql/parts/insights/common/interfaces.ts @@ -6,7 +6,7 @@ import { Event } from 'vs/base/common/event'; import { createDecorator } from 'vs/platform/instantiation/common/instantiation'; import { IInsightsConfigDetails, IInsightsConfig } from 'sql/parts/dashboard/widgets/insights/interfaces'; -import { IConnectionProfile } from 'sql/parts/connection/common/interfaces'; +import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; import { BaseActionContext } from 'sql/workbench/common/actions'; export interface IInsightsDialogModel { diff --git a/src/sql/parts/insights/insightsDialogService.ts b/src/sql/parts/insights/insightsDialogService.ts index cc38a0f89e..21e1edb140 100644 --- a/src/sql/parts/insights/insightsDialogService.ts +++ b/src/sql/parts/insights/insightsDialogService.ts @@ -6,7 +6,7 @@ import { IInstantiationService } from 'vs/platform/instantiation/common/instanti import { InsightsDialogController } from 'sql/parts/insights/node/insightsDialogController'; import { InsightsDialogView } from 'sql/parts/insights/browser/insightsDialogView'; -import { IConnectionProfile } from 'sql/parts/connection/common/interfaces'; +import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; import { IInsightsConfig } from 'sql/parts/dashboard/widgets/insights/interfaces'; import { IInsightsDialogModel, IInsightsDialogService } from 'sql/parts/insights/common/interfaces'; import { InsightsDialogModel } from 'sql/parts/insights/common/insightsDialogModel'; diff --git a/src/sql/parts/insights/node/insightsDialogController.ts b/src/sql/parts/insights/node/insightsDialogController.ts index a8324859fb..37b6d48d24 100644 --- a/src/sql/parts/insights/node/insightsDialogController.ts +++ b/src/sql/parts/insights/node/insightsDialogController.ts @@ -3,13 +3,14 @@ * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { IConnectionManagementService, IErrorMessageService } from 'sql/parts/connection/common/connectionManagement'; -import { IConnectionProfile } from 'sql/parts/connection/common/interfaces'; +import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement'; +import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; import { IInsightsConfigDetails } from 'sql/parts/dashboard/widgets/insights/interfaces'; -import QueryRunner, { EventType as QREvents } from 'sql/parts/query/execution/queryRunner'; -import * as Utils from 'sql/parts/connection/common/utils'; +import QueryRunner, { EventType as QREvents } from 'sql/platform/query/common/queryRunner'; +import * as Utils from 'sql/platform/connection/common/utils'; import { IInsightsDialogModel, insertValueRegex } from 'sql/parts/insights/common/interfaces'; import { error } from 'sql/base/common/log'; +import { IErrorMessageService } from 'sql/platform/errorMessage/common/errorMessageService'; import { DbCellValue, IDbColumn, QueryExecuteSubsetResult } from 'sqlops'; diff --git a/src/sql/parts/jobManagement/agent/agentView.component.ts b/src/sql/parts/jobManagement/agent/agentView.component.ts index 7f159a31d6..aacb9195fd 100644 --- a/src/sql/parts/jobManagement/agent/agentView.component.ts +++ b/src/sql/parts/jobManagement/agent/agentView.component.ts @@ -10,8 +10,8 @@ import * as nls from 'vs/nls'; import { Component, Inject, forwardRef, ChangeDetectorRef, ViewChild, Injectable } from '@angular/core'; import { AgentJobInfo } from 'sqlops'; import { PanelComponent, IPanelOptions, NavigationBarLayout } from 'sql/base/browser/ui/panel/panel.component'; -import { IJobManagementService } from 'sql/parts/jobManagement/common/interfaces'; -import { IDashboardService } from 'sql/services/dashboard/common/dashboardService'; +import { IJobManagementService } from 'sql/platform/jobManagement/common/interfaces'; +import { IDashboardService } from 'sql/platform/dashboard/browser/dashboardService'; export const DASHBOARD_SELECTOR: string = 'agentview-component'; @@ -51,7 +51,7 @@ export class AgentViewComponent { constructor( @Inject(forwardRef(() => ChangeDetectorRef)) private _cd: ChangeDetectorRef, @Inject(IJobManagementService) jobManagementService: IJobManagementService, - @Inject(IDashboardService) dashboardService: IDashboardService,) { + @Inject(IDashboardService) dashboardService: IDashboardService, ) { this._expanded = new Map(); let self = this; diff --git a/src/sql/parts/jobManagement/views/alertsView.component.ts b/src/sql/parts/jobManagement/views/alertsView.component.ts index 57979b22f1..0e025da88a 100644 --- a/src/sql/parts/jobManagement/views/alertsView.component.ts +++ b/src/sql/parts/jobManagement/views/alertsView.component.ts @@ -19,8 +19,8 @@ import { Component, Inject, forwardRef, ElementRef, ChangeDetectorRef, ViewChild import { TabChild } from 'sql/base/browser/ui/panel/tab.component'; import { Table } from 'sql/base/browser/ui/table/table'; import { AgentViewComponent } from 'sql/parts/jobManagement/agent/agentView.component'; -import { IJobManagementService } from 'sql/parts/jobManagement/common/interfaces'; -import { EditAlertAction, DeleteAlertAction, NewAlertAction } from 'sql/parts/jobManagement/common/jobActions'; +import { IJobManagementService } from 'sql/platform/jobManagement/common/interfaces'; +import { EditAlertAction, DeleteAlertAction, NewAlertAction } from 'sql/platform/jobManagement/common/jobActions'; import { JobManagementView } from 'sql/parts/jobManagement/views/jobManagementView'; import { CommonServiceInterface } from 'sql/services/common/commonServiceInterface.service'; import { ICommandService } from 'vs/platform/commands/common/commands'; @@ -29,8 +29,8 @@ import { IAction } from 'vs/base/common/actions'; import { TPromise } from 'vs/base/common/winjs.base'; import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; -import { IDashboardService } from 'sql/services/dashboard/common/dashboardService'; -import { AlertsCacheObject } from 'sql/parts/jobManagement/common/jobManagementService'; +import { IDashboardService } from 'sql/platform/dashboard/browser/dashboardService'; +import { AlertsCacheObject } from 'sql/platform/jobManagement/common/jobManagementService'; import { RowDetailView } from 'sql/base/browser/ui/table/plugins/rowdetailview'; export const VIEW_SELECTOR: string = 'jobalertsview-component'; @@ -84,7 +84,7 @@ export class AlertsViewComponent extends JobManagementView implements OnInit, On @Inject(IInstantiationService) instantiationService: IInstantiationService, @Inject(forwardRef(() => CommonServiceInterface)) commonService: CommonServiceInterface, @Inject(IContextMenuService) contextMenuService: IContextMenuService, - @Inject(IKeybindingService) keybindingService: IKeybindingService, + @Inject(IKeybindingService) keybindingService: IKeybindingService, @Inject(IDashboardService) _dashboardService: IDashboardService) { super(commonService, _dashboardService, contextMenuService, keybindingService, instantiationService); this._didTabChange = false; @@ -100,7 +100,7 @@ export class AlertsViewComponent extends JobManagementView implements OnInit, On } } - ngOnInit(){ + ngOnInit() { // set base class elements this._visibilityElement = this._gridEl; this._parentComponent = this._agentViewComponent; @@ -148,7 +148,7 @@ export class AlertsViewComponent extends JobManagementView implements OnInit, On $(this._gridEl.nativeElement).empty(); $(this.actionBarContainer.nativeElement).empty(); this.initActionBar(); - this._table = new Table(this._gridEl.nativeElement, {columns}, this.options); + this._table = new Table(this._gridEl.nativeElement, { columns }, this.options); this._table.grid.setData(this.dataView, true); this._register(this._table.onContextMenu(e => { self.openContextMenu(e); diff --git a/src/sql/parts/jobManagement/views/jobHistory.component.ts b/src/sql/parts/jobManagement/views/jobHistory.component.ts index ff4cb6a079..1e7decdc76 100644 --- a/src/sql/parts/jobManagement/views/jobHistory.component.ts +++ b/src/sql/parts/jobManagement/views/jobHistory.component.ts @@ -13,10 +13,10 @@ import { OnInit, Component, Inject, Input, forwardRef, ElementRef, ChangeDetecto import { Taskbar } from 'sql/base/browser/ui/taskbar/taskbar'; import { AgentViewComponent } from 'sql/parts/jobManagement/agent/agentView.component'; import { CommonServiceInterface } from 'sql/services/common/commonServiceInterface.service'; -import { RunJobAction, StopJobAction, EditJobAction, JobsRefreshAction } from 'sql/parts/jobManagement/common/jobActions'; -import { JobCacheObject } from 'sql/parts/jobManagement/common/jobManagementService'; -import { JobManagementUtilities } from 'sql/parts/jobManagement/common/jobManagementUtilities'; -import { IJobManagementService } from 'sql/parts/jobManagement/common/interfaces'; +import { RunJobAction, StopJobAction, EditJobAction, JobsRefreshAction } from 'sql/platform/jobManagement/common/jobActions'; +import { JobCacheObject } from 'sql/platform/jobManagement/common/jobManagementService'; +import { JobManagementUtilities } from 'sql/platform/jobManagement/common/jobManagementUtilities'; +import { IJobManagementService } from 'sql/platform/jobManagement/common/interfaces'; import { JobHistoryController, JobHistoryDataSource, JobHistoryRenderer, JobHistoryFilter, JobHistoryModel, JobHistoryRow } from 'sql/parts/jobManagement/views/jobHistoryTree'; import { JobStepsViewRow } from 'sql/parts/jobManagement/views/jobStepsViewTree'; @@ -28,7 +28,7 @@ import { ScrollbarVisibility } from 'vs/base/common/scrollable'; import { IContextMenuService } from 'vs/platform/contextview/browser/contextView'; import { JobManagementView } from 'sql/parts/jobManagement/views/jobManagementView'; import { TabChild } from 'sql/base/browser/ui/panel/tab.component'; -import { IDashboardService } from 'sql/services/dashboard/common/dashboardService'; +import { IDashboardService } from 'sql/platform/dashboard/browser/dashboardService'; import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding'; import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry'; import * as TelemetryKeys from 'sql/common/telemetryKeys'; @@ -77,7 +77,7 @@ export class JobHistoryComponent extends JobManagementView implements OnInit { @Inject(IInstantiationService) private instantiationService: IInstantiationService, @Inject(IContextMenuService) private contextMenuService: IContextMenuService, @Inject(IJobManagementService) private _jobManagementService: IJobManagementService, - @Inject(IKeybindingService) keybindingService: IKeybindingService, + @Inject(IKeybindingService) keybindingService: IKeybindingService, @Inject(IDashboardService) dashboardService: IDashboardService, @Inject(ITelemetryService) private _telemetryService: ITelemetryService ) { @@ -85,7 +85,7 @@ export class JobHistoryComponent extends JobManagementView implements OnInit { this._treeController = new JobHistoryController(); this._treeDataSource = new JobHistoryDataSource(); this._treeRenderer = new JobHistoryRenderer(); - this._treeFilter = new JobHistoryFilter(); + this._treeFilter = new JobHistoryFilter(); let jobCacheObjectMap = this._jobManagementService.jobCacheObjectMap; this._serverName = commonService.connectionManagementService.connectionInfo.connectionProfile.serverName; let jobCache = jobCacheObjectMap[this._serverName]; @@ -142,7 +142,7 @@ export class JobHistoryComponent extends JobManagementView implements OnInit { dataSource: this._treeDataSource, filter: this._treeFilter, renderer: this._treeRenderer - }, {verticalScrollMode: ScrollbarVisibility.Visible}); + }, { verticalScrollMode: ScrollbarVisibility.Visible }); this._register(attachListStyler(this._tree, this.themeService)); this._tree.layout(dom.getContentHeight(this._tableContainer.nativeElement)); this._telemetryService.publicLog(TelemetryKeys.JobHistoryView); @@ -281,7 +281,7 @@ export class JobHistoryComponent extends JobManagementView implements OnInit { this.agentJobInfo = this._agentJobInfo; } - if (this.isRefreshing ) { + if (this.isRefreshing) { this.loadHistory(); return; } @@ -299,7 +299,7 @@ export class JobHistoryComponent extends JobManagementView implements OnInit { this._actionBar.context = { targetObject: this._agentJobInfo, ownerUri: this.ownerUri, jobHistoryComponent: this }; this._cd.detectChanges(); } - } else if (jobHistories && jobHistories.length === 0 ){ + } else if (jobHistories && jobHistories.length === 0) { this._showPreviousRuns = false; this._showSteps = false; this._noJobsAvailable = true; diff --git a/src/sql/parts/jobManagement/views/jobManagementView.ts b/src/sql/parts/jobManagement/views/jobManagementView.ts index 5f9a3e241c..663087bb32 100644 --- a/src/sql/parts/jobManagement/views/jobManagementView.ts +++ b/src/sql/parts/jobManagement/views/jobManagementView.ts @@ -9,15 +9,14 @@ import { AgentViewComponent } from 'sql/parts/jobManagement/agent/agentView.comp import { CommonServiceInterface } from 'sql/services/common/commonServiceInterface.service'; import { IAction, Action } from 'vs/base/common/actions'; import { ResolvedKeybinding } from 'vs/base/common/keyCodes'; -import { Disposable } from 'vs/base/common/lifecycle'; import { TPromise } from 'vs/base/common/winjs.base'; import { IContextMenuService } from 'vs/platform/contextview/browser/contextView'; import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; import { Taskbar } from '../../../base/browser/ui/taskbar/taskbar'; -import { JobsRefreshAction } from 'sql/parts/jobManagement/common/jobActions'; +import { JobsRefreshAction } from 'sql/platform/jobManagement/common/jobActions'; import { TabChild } from 'sql/base/browser/ui/panel/tab.component'; -import { IDashboardService } from 'sql/services/dashboard/common/dashboardService'; +import { IDashboardService } from 'sql/platform/dashboard/browser/dashboardService'; export abstract class JobManagementView extends TabChild implements AfterContentChecked { protected isVisible: boolean = false; @@ -79,7 +78,7 @@ export abstract class JobManagementView extends TabChild implements AfterContent let actions = this.getTableActions(); if (actions) { let ownerUri: string = this._commonService.connectionManagementService.connectionInfo.ownerUri; - let actionContext= { + let actionContext = { ownerUri: ownerUri, targetObject: targetObject }; diff --git a/src/sql/parts/jobManagement/views/jobStepsView.component.ts b/src/sql/parts/jobManagement/views/jobStepsView.component.ts index a41cee8c38..75a07c90de 100644 --- a/src/sql/parts/jobManagement/views/jobStepsView.component.ts +++ b/src/sql/parts/jobManagement/views/jobStepsView.component.ts @@ -12,11 +12,13 @@ import { Tree } from 'vs/base/parts/tree/browser/treeImpl'; import { ScrollbarVisibility } from 'vs/base/common/scrollable'; import { IWorkbenchThemeService } from 'vs/workbench/services/themes/common/workbenchThemeService'; import { CommonServiceInterface } from 'sql/services/common/commonServiceInterface.service'; -import { JobStepsViewController, JobStepsViewDataSource, JobStepsViewFilter, - JobStepsViewRenderer, JobStepsViewModel} from 'sql/parts/jobManagement/views/jobStepsViewTree'; +import { + JobStepsViewController, JobStepsViewDataSource, JobStepsViewFilter, + JobStepsViewRenderer, JobStepsViewModel +} from 'sql/parts/jobManagement/views/jobStepsViewTree'; import { JobHistoryComponent } from 'sql/parts/jobManagement/views/jobHistory.component'; import { JobManagementView } from 'sql/parts/jobManagement/views/jobManagementView'; -import { IDashboardService } from 'sql/services/dashboard/common/dashboardService'; +import { IDashboardService } from 'sql/platform/dashboard/browser/dashboardService'; import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding'; import { IContextMenuService } from 'vs/platform/contextview/browser/contextView'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; @@ -31,13 +33,13 @@ export const JOBSTEPSVIEW_SELECTOR: string = 'jobstepsview-component'; templateUrl: decodeURI(require.toUrl('./jobStepsView.component.html')), providers: [{ provide: TabChild, useExisting: forwardRef(() => JobStepsViewComponent) }], }) -export class JobStepsViewComponent extends JobManagementView implements OnInit, AfterContentChecked { +export class JobStepsViewComponent extends JobManagementView implements OnInit, AfterContentChecked { private _tree: Tree; private _treeController = new JobStepsViewController(); private _treeDataSource = new JobStepsViewDataSource(); private _treeRenderer = new JobStepsViewRenderer(); - private _treeFilter = new JobStepsViewFilter(); + private _treeFilter = new JobStepsViewFilter(); @ViewChild('table') private _tableContainer: ElementRef; @@ -49,7 +51,7 @@ export class JobStepsViewComponent extends JobManagementView implements OnInit, @Inject(IWorkbenchThemeService) private themeService: IWorkbenchThemeService, @Inject(IInstantiationService) instantiationService: IInstantiationService, @Inject(IContextMenuService) contextMenuService: IContextMenuService, - @Inject(IKeybindingService) keybindingService: IKeybindingService, + @Inject(IKeybindingService) keybindingService: IKeybindingService, @Inject(IDashboardService) dashboardService: IDashboardService, @Inject(ITelemetryService) private _telemetryService: ITelemetryService ) { @@ -101,7 +103,7 @@ export class JobStepsViewComponent extends JobManagementView implements OnInit, dataSource: this._treeDataSource, filter: this._treeFilter, renderer: this._treeRenderer - }, {verticalScrollMode: ScrollbarVisibility.Visible, horizontalScrollMode: ScrollbarVisibility.Visible }); + }, { verticalScrollMode: ScrollbarVisibility.Visible, horizontalScrollMode: ScrollbarVisibility.Visible }); this._register(attachListStyler(this._tree, this.themeService)); this._telemetryService.publicLog(TelemetryKeys.JobStepsView); } diff --git a/src/sql/parts/jobManagement/views/jobsView.component.ts b/src/sql/parts/jobManagement/views/jobsView.component.ts index bbb84f4107..3dffda8e37 100644 --- a/src/sql/parts/jobManagement/views/jobsView.component.ts +++ b/src/sql/parts/jobManagement/views/jobsView.component.ts @@ -20,11 +20,11 @@ import { TabChild } from 'sql/base/browser/ui/panel/tab.component'; import { Table } from 'sql/base/browser/ui/table/table'; import { AgentViewComponent } from 'sql/parts/jobManagement/agent/agentView.component'; import { RowDetailView } from 'sql/base/browser/ui/table/plugins/rowdetailview'; -import { JobCacheObject } from 'sql/parts/jobManagement/common/jobManagementService'; -import { EditJobAction, DeleteJobAction, NewJobAction } from 'sql/parts/jobManagement/common/jobActions'; -import { JobManagementUtilities } from 'sql/parts/jobManagement/common/jobManagementUtilities'; +import { JobCacheObject } from 'sql/platform/jobManagement/common/jobManagementService'; +import { EditJobAction, DeleteJobAction, NewJobAction } from 'sql/platform/jobManagement/common/jobActions'; +import { JobManagementUtilities } from 'sql/platform/jobManagement/common/jobManagementUtilities'; import { HeaderFilter } from 'sql/base/browser/ui/table/plugins/headerFilter.plugin'; -import { IJobManagementService } from 'sql/parts/jobManagement/common/interfaces'; +import { IJobManagementService } from 'sql/platform/jobManagement/common/interfaces'; import { JobManagementView } from 'sql/parts/jobManagement/views/jobManagementView'; import { CommonServiceInterface } from 'sql/services/common/commonServiceInterface.service'; import { ICommandService } from 'vs/platform/commands/common/commands'; @@ -33,7 +33,7 @@ import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding'; import { TPromise } from 'vs/base/common/winjs.base'; import { IAction } from 'vs/base/common/actions'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; -import { IDashboardService } from 'sql/services/dashboard/common/dashboardService'; +import { IDashboardService } from 'sql/platform/dashboard/browser/dashboardService'; import { escape } from 'sql/base/common/strings'; import { IWorkbenchThemeService, IColorTheme } from 'vs/workbench/services/themes/common/workbenchThemeService'; import { tableBackground, cellBackground, cellBorderColor } from 'sql/common/theme/colors'; @@ -106,7 +106,7 @@ export class JobsViewComponent extends JobManagementView implements OnInit, OnDe @Inject(ICommandService) private _commandService: ICommandService, @Inject(IInstantiationService) instantiationService: IInstantiationService, @Inject(IContextMenuService) contextMenuService: IContextMenuService, - @Inject(IKeybindingService) keybindingService: IKeybindingService, + @Inject(IKeybindingService) keybindingService: IKeybindingService, @Inject(IDashboardService) _dashboardService: IDashboardService, @Inject(ITelemetryService) private _telemetryService: ITelemetryService ) { @@ -123,7 +123,7 @@ export class JobsViewComponent extends JobManagementView implements OnInit, OnDe this._isCloud = commonService.connectionManagementService.connectionInfo.serverInfo.isCloud; } - ngOnInit(){ + ngOnInit() { // set base class elements this._visibilityElement = this._gridEl; this._parentComponent = this._agentViewComponent; @@ -185,7 +185,7 @@ export class JobsViewComponent extends JobManagementView implements OnInit, OnDe $(this._gridEl.nativeElement).empty(); $(this.actionBarContainer.nativeElement).empty(); this.initActionBar(); - this._table = new Table(this._gridEl.nativeElement, {columns}, options); + this._table = new Table(this._gridEl.nativeElement, { columns }, options); this._table.grid.setData(this.dataView, true); this._table.grid.onClick.subscribe((e, args) => { let job = self.getJob(args); @@ -507,11 +507,11 @@ export class JobsViewComponent extends JobManagementView implements OnInit, OnDe if (runChart && runChart.length > 0) { return ` - - - - - + + + + +
${runChart[0] ? runChart[0] : '
' }		${runChart[1] ? runChart[1] : '
' }		${runChart[2] ? runChart[2] : '
' }		${runChart[3] ? runChart[3] : '
' }		${runChart[4] ? runChart[4] : '
' }		${runChart[0] ? runChart[0] : '
'}		${runChart[1] ? runChart[1] : '
'}		${runChart[2] ? runChart[2] : '
'}		${runChart[3] ? runChart[3] : '
'}		${runChart[4] ? runChart[4] : '
'}
`; } else { @@ -906,7 +906,7 @@ export class JobsViewComponent extends JobManagementView implements OnInit, OnDe return undefined; } - let jobId = data.getItem(rowIndex).jobId; + let jobId = data.getItem(rowIndex).jobId; if (!jobId) { // if we couldn't find the ID, check if it's an // error row diff --git a/src/sql/parts/jobManagement/views/operatorsView.component.ts b/src/sql/parts/jobManagement/views/operatorsView.component.ts index dfd3b6512e..006b65f6cb 100644 --- a/src/sql/parts/jobManagement/views/operatorsView.component.ts +++ b/src/sql/parts/jobManagement/views/operatorsView.component.ts @@ -18,8 +18,8 @@ import * as sqlops from 'sqlops'; import { Component, Inject, forwardRef, ElementRef, ChangeDetectorRef, ViewChild, OnInit, OnDestroy } from '@angular/core'; import { Table } from 'sql/base/browser/ui/table/table'; import { AgentViewComponent } from 'sql/parts/jobManagement/agent/agentView.component'; -import { IJobManagementService } from 'sql/parts/jobManagement/common/interfaces'; -import { EditOperatorAction, DeleteOperatorAction, NewOperatorAction } from 'sql/parts/jobManagement/common/jobActions'; +import { IJobManagementService } from 'sql/platform/jobManagement/common/interfaces'; +import { EditOperatorAction, DeleteOperatorAction, NewOperatorAction } from 'sql/platform/jobManagement/common/jobActions'; import { JobManagementView } from 'sql/parts/jobManagement/views/jobManagementView'; import { CommonServiceInterface } from 'sql/services/common/commonServiceInterface.service'; import { TabChild } from 'sql/base/browser/ui/panel/tab.component'; @@ -29,8 +29,8 @@ import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding'; import { TPromise } from 'vs/base/common/winjs.base'; import { IAction } from 'vs/base/common/actions'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; -import { IDashboardService } from 'sql/services/dashboard/common/dashboardService'; -import { OperatorsCacheObject } from 'sql/parts/jobManagement/common/jobManagementService'; +import { IDashboardService } from 'sql/platform/dashboard/browser/dashboardService'; +import { OperatorsCacheObject } from 'sql/platform/jobManagement/common/jobManagementService'; import { RowDetailView } from 'sql/base/browser/ui/table/plugins/rowdetailview'; export const VIEW_SELECTOR: string = 'joboperatorsview-component'; @@ -83,7 +83,7 @@ export class OperatorsViewComponent extends JobManagementView implements OnInit, @Inject(IInstantiationService) instantiationService: IInstantiationService, @Inject(forwardRef(() => CommonServiceInterface)) commonService: CommonServiceInterface, @Inject(IContextMenuService) contextMenuService: IContextMenuService, - @Inject(IKeybindingService) keybindingService: IKeybindingService, + @Inject(IKeybindingService) keybindingService: IKeybindingService, @Inject(IDashboardService) _dashboardService: IDashboardService ) { super(commonService, _dashboardService, contextMenuService, keybindingService, instantiationService); @@ -99,7 +99,7 @@ export class OperatorsViewComponent extends JobManagementView implements OnInit, } } - ngOnInit(){ + ngOnInit() { // set base class elements this._visibilityElement = this._gridEl; this._parentComponent = this._agentViewComponent; @@ -149,7 +149,7 @@ export class OperatorsViewComponent extends JobManagementView implements OnInit, $(this._gridEl.nativeElement).empty(); $(this.actionBarContainer.nativeElement).empty(); this.initActionBar(); - this._table = new Table(this._gridEl.nativeElement, {columns}, this.options); + this._table = new Table(this._gridEl.nativeElement, { columns }, this.options); this._table.grid.setData(this.dataView, true); this._register(this._table.onContextMenu(e => { @@ -217,7 +217,7 @@ export class OperatorsViewComponent extends JobManagementView implements OnInit, private renderName(row, cell, value, columnDef, dataContext) { let resultIndicatorClass = dataContext.enabled ? 'operatorview-operatornameindicatorenabled' : 'operatorview-operatornameindicatordisabled'; - return '' + + return '
' + '' + '' + '
' + dataContext.name + '
'; diff --git a/src/sql/parts/jobManagement/views/proxiesView.component.ts b/src/sql/parts/jobManagement/views/proxiesView.component.ts index bc5e1a43df..87e676b42f 100644 --- a/src/sql/parts/jobManagement/views/proxiesView.component.ts +++ b/src/sql/parts/jobManagement/views/proxiesView.component.ts @@ -18,8 +18,8 @@ import * as nls from 'vs/nls'; import { Component, Inject, forwardRef, ElementRef, ChangeDetectorRef, ViewChild, OnInit, OnDestroy } from '@angular/core'; import { Table } from 'sql/base/browser/ui/table/table'; import { AgentViewComponent } from 'sql/parts/jobManagement/agent/agentView.component'; -import { IJobManagementService } from 'sql/parts/jobManagement/common/interfaces'; -import { EditProxyAction, DeleteProxyAction, NewProxyAction } from 'sql/parts/jobManagement/common/jobActions'; +import { IJobManagementService } from 'sql/platform/jobManagement/common/interfaces'; +import { EditProxyAction, DeleteProxyAction, NewProxyAction } from 'sql/platform/jobManagement/common/jobActions'; import { CommonServiceInterface } from 'sql/services/common/commonServiceInterface.service'; import { TabChild } from 'sql/base/browser/ui/panel/tab.component'; import { JobManagementView } from 'sql/parts/jobManagement/views/jobManagementView'; @@ -29,8 +29,8 @@ import { TPromise } from 'vs/base/common/winjs.base'; import { IAction } from 'vs/base/common/actions'; import { ICommandService } from 'vs/platform/commands/common/commands'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; -import { IDashboardService } from 'sql/services/dashboard/common/dashboardService'; -import { ProxiesCacheObject } from 'sql/parts/jobManagement/common/jobManagementService'; +import { IDashboardService } from 'sql/platform/dashboard/browser/dashboardService'; +import { ProxiesCacheObject } from 'sql/platform/jobManagement/common/jobManagementService'; import { RowDetailView } from 'sql/base/browser/ui/table/plugins/rowdetailview'; export const VIEW_SELECTOR: string = 'jobproxiesview-component'; @@ -56,8 +56,8 @@ export class ProxiesViewComponent extends JobManagementView implements OnInit, O id: 'accountName' }, { name: nls.localize('jobProxiesView.credentialName', 'Credential Name'), field: 'credentialName', width: 200, id: 'credentialName' }, - { name: nls.localize('jobProxiesView.description', 'Description'), field: 'description', width: 200, id: 'description'}, - { name: nls.localize('jobProxiesView.isEnabled', 'Enabled'), field: 'isEnabled', width: 200, id: 'isEnabled'} + { name: nls.localize('jobProxiesView.description', 'Description'), field: 'description', width: 200, id: 'description' }, + { name: nls.localize('jobProxiesView.isEnabled', 'Enabled'), field: 'isEnabled', width: 200, id: 'isEnabled' } ]; private options: Slick.GridOptions = { @@ -87,7 +87,7 @@ export class ProxiesViewComponent extends JobManagementView implements OnInit, O @Inject(IInstantiationService) instantiationService: IInstantiationService, @Inject(forwardRef(() => CommonServiceInterface)) commonService: CommonServiceInterface, @Inject(IContextMenuService) contextMenuService: IContextMenuService, - @Inject(IKeybindingService) keybindingService: IKeybindingService, + @Inject(IKeybindingService) keybindingService: IKeybindingService, @Inject(IDashboardService) _dashboardService: IDashboardService ) { super(commonService, _dashboardService, contextMenuService, keybindingService, instantiationService); @@ -103,7 +103,7 @@ export class ProxiesViewComponent extends JobManagementView implements OnInit, O } } - ngOnInit(){ + ngOnInit() { // set base class elements this._visibilityElement = this._gridEl; this._parentComponent = this._agentViewComponent; @@ -152,7 +152,7 @@ export class ProxiesViewComponent extends JobManagementView implements OnInit, O $(this._gridEl.nativeElement).empty(); $(this.actionBarContainer.nativeElement).empty(); this.initActionBar(); - this._table = new Table(this._gridEl.nativeElement, {columns}, this.options); + this._table = new Table(this._gridEl.nativeElement, { columns }, this.options); this._table.grid.setData(this.dataView, true); this._register(this._table.onContextMenu(e => { @@ -221,7 +221,7 @@ export class ProxiesViewComponent extends JobManagementView implements OnInit, O private renderName(row, cell, value, columnDef, dataContext) { let resultIndicatorClass = dataContext.isEnabled ? 'proxyview-proxynameindicatorenabled' : 'proxyview-proxynameindicatordisabled'; - return '' + + return '
' + '' + '' + '
' + dataContext.accountName + '
'; diff --git a/src/sql/parts/modelComponents/modelComponentWrapper.component.ts b/src/sql/parts/modelComponents/modelComponentWrapper.component.ts index 1f470b050e..f8d9e4e434 100644 --- a/src/sql/parts/modelComponents/modelComponentWrapper.component.ts +++ b/src/sql/parts/modelComponents/modelComponentWrapper.component.ts @@ -5,29 +5,24 @@ import 'vs/css!sql/media/icons/common-icons'; import { - Component, Input, Inject, forwardRef, ComponentFactoryResolver, AfterContentInit, ViewChild, - ElementRef, OnInit, ChangeDetectorRef, OnDestroy, ReflectiveInjector, Injector, Type, ComponentRef + Component, Input, Inject, forwardRef, ComponentFactoryResolver, ViewChild, + ElementRef, OnInit, ChangeDetectorRef, ReflectiveInjector, Injector, ComponentRef } from '@angular/core'; import { ComponentHostDirective } from 'sql/parts/dashboard/common/componentHost.directive'; import { error } from 'sql/base/common/log'; -import { AngularDisposable } from 'sql/base/common/lifecycle'; -import { DashboardServiceInterface } from 'sql/parts/dashboard/services/dashboardServiceInterface.service'; +import { AngularDisposable } from 'sql/base/node/lifecycle'; import { IComponent, IComponentConfig, IComponentDescriptor, IModelStore, COMPONENT_CONFIG } from './interfaces'; import { Extensions, IComponentRegistry } from 'sql/platform/dashboard/common/modelComponentRegistry'; -import { IDisposable } from 'vs/base/common/lifecycle'; import { IColorTheme, IWorkbenchThemeService } from 'vs/workbench/services/themes/common/workbenchThemeService'; import * as colors from 'vs/platform/theme/common/colorRegistry'; import * as themeColors from 'vs/workbench/common/theme'; -import { Action } from 'vs/base/common/actions'; import { Registry } from 'vs/platform/registry/common/platform'; -import { ActionBar } from 'vs/base/browser/ui/actionbar/actionbar'; import { memoize } from 'vs/base/common/decorators'; import { generateUuid } from 'vs/base/common/uuid'; import { IBootstrapParams } from 'sql/services/bootstrap/bootstrapService'; -import { Event, Emitter } from 'vs/base/common/event'; -import * as nls from 'vs/nls'; +import { Event } from 'vs/base/common/event'; import { LayoutRequestParams } from 'sql/platform/dialog/dialogContainer.component'; const componentRegistry = Registry.as(Extensions.ComponentContribution); diff --git a/src/sql/parts/modelComponents/modelViewContent.component.ts b/src/sql/parts/modelComponents/modelViewContent.component.ts index ff19643cd1..87e593401c 100644 --- a/src/sql/parts/modelComponents/modelViewContent.component.ts +++ b/src/sql/parts/modelComponents/modelViewContent.component.ts @@ -4,21 +4,17 @@ *--------------------------------------------------------------------------------------------*/ // import 'vs/css!./modelViewContent'; -import { Component, forwardRef, Input, OnInit, Inject, ChangeDetectorRef, ElementRef } from '@angular/core'; +import { Component, forwardRef, Input, OnInit, Inject, ChangeDetectorRef } from '@angular/core'; import { Event, Emitter } from 'vs/base/common/event'; -import { Parts } from 'vs/workbench/services/part/common/partService'; -import { IDisposable, Disposable } from 'vs/base/common/lifecycle'; +import { IDisposable } from 'vs/base/common/lifecycle'; import { addDisposableListener, EventType } from 'vs/base/browser/dom'; import { memoize } from 'vs/base/common/decorators'; -import * as nls from 'vs/nls'; -import { TabConfig } from 'sql/parts/dashboard/common/dashboardWidget'; import { CommonServiceInterface } from 'sql/services/common/commonServiceInterface.service'; -import { IModelView } from 'sql/services/model/modelViewService'; -import { AngularDisposable } from 'sql/base/common/lifecycle'; +import { IModelView } from 'sql/platform/model/common/modelViewService'; import { ViewBase } from 'sql/parts/modelComponents/viewBase'; -import { IModelViewService } from 'sql/services/modelComponents/modelViewService'; +import { IModelViewService } from 'sql/platform/modelComponents/common/modelViewService'; import * as sqlops from 'sqlops'; diff --git a/src/sql/parts/modelComponents/viewBase.ts b/src/sql/parts/modelComponents/viewBase.ts index 06be6c3b1c..b1ccf62bae 100644 --- a/src/sql/parts/modelComponents/viewBase.ts +++ b/src/sql/parts/modelComponents/viewBase.ts @@ -12,9 +12,9 @@ import nls = require('vs/nls'); import * as sqlops from 'sqlops'; import { IModelStore, IComponentDescriptor, IComponent } from './interfaces'; import { IItemConfig, ModelComponentTypes, IComponentShape } from 'sql/workbench/api/common/sqlExtHostTypes'; -import { IModelView, IModelViewEventArgs } from 'sql/services/model/modelViewService'; +import { IModelView, IModelViewEventArgs } from 'sql/platform/model/common/modelViewService'; import { Extensions, IComponentRegistry } from 'sql/platform/dashboard/common/modelComponentRegistry'; -import { AngularDisposable } from 'sql/base/common/lifecycle'; +import { AngularDisposable } from 'sql/base/node/lifecycle'; import { ModelStore } from 'sql/parts/modelComponents/modelStore'; import { Event, Emitter } from 'vs/base/common/event'; diff --git a/src/sql/parts/notebook/cellViews/code.component.ts b/src/sql/parts/notebook/cellViews/code.component.ts index 6c031602c5..62108121c0 100644 --- a/src/sql/parts/notebook/cellViews/code.component.ts +++ b/src/sql/parts/notebook/cellViews/code.component.ts @@ -7,7 +7,7 @@ import 'vs/css!./code'; import { OnInit, Component, Input, Inject, forwardRef, ElementRef, ChangeDetectorRef, ViewChild, Output, EventEmitter, OnChanges, SimpleChange } from '@angular/core'; import { CommonServiceInterface } from 'sql/services/common/commonServiceInterface.service'; -import { AngularDisposable } from 'sql/base/common/lifecycle'; +import { AngularDisposable } from 'sql/base/node/lifecycle'; import { QueryTextEditor } from 'sql/parts/modelComponents/queryTextEditor'; import { CellToggleMoreActions } from 'sql/parts/notebook/cellToggleMoreActions'; import { ICellModel } from 'sql/parts/notebook/models/modelInterfaces'; diff --git a/src/sql/parts/notebook/cellViews/interfaces.ts b/src/sql/parts/notebook/cellViews/interfaces.ts index 1f188b6663..1fb167c193 100644 --- a/src/sql/parts/notebook/cellViews/interfaces.ts +++ b/src/sql/parts/notebook/cellViews/interfaces.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import { OnDestroy } from '@angular/core'; -import { AngularDisposable } from 'sql/base/common/lifecycle'; +import { AngularDisposable } from 'sql/base/node/lifecycle'; export abstract class CellView extends AngularDisposable implements OnDestroy { constructor() { diff --git a/src/sql/parts/notebook/cellViews/output.component.ts b/src/sql/parts/notebook/cellViews/output.component.ts index 9d7de2c8c4..09f581609d 100644 --- a/src/sql/parts/notebook/cellViews/output.component.ts +++ b/src/sql/parts/notebook/cellViews/output.component.ts @@ -4,12 +4,12 @@ *--------------------------------------------------------------------------------------------*/ import 'vs/css!./code'; -import { OnInit, Component, Input, Inject, forwardRef, ElementRef, ChangeDetectorRef, OnDestroy, ViewChild, Output, EventEmitter } from '@angular/core'; -import { AngularDisposable } from 'sql/base/common/lifecycle'; +import { OnInit, Component, Input, Inject, ElementRef, ViewChild } from '@angular/core'; +import { AngularDisposable } from 'sql/base/node/lifecycle'; import { nb } from 'sqlops'; -import { INotebookService } from 'sql/services/notebook/notebookService'; +import { INotebookService } from 'sql/workbench/services/notebook/common/notebookService'; import { MimeModel } from 'sql/parts/notebook/outputs/common/mimemodel'; -import * as outputProcessor from '../outputs/common/outputProcessor'; +import * as outputProcessor from 'sql/parts/notebook/outputs/common/outputProcessor'; import { RenderMimeRegistry } from 'sql/parts/notebook/outputs/registry'; import 'vs/css!sql/parts/notebook/outputs/style/index'; diff --git a/src/sql/parts/notebook/cellViews/outputArea.component.ts b/src/sql/parts/notebook/cellViews/outputArea.component.ts index 152b807ab6..c20ec93102 100644 --- a/src/sql/parts/notebook/cellViews/outputArea.component.ts +++ b/src/sql/parts/notebook/cellViews/outputArea.component.ts @@ -5,7 +5,7 @@ import 'vs/css!./code'; import 'vs/css!./outputArea'; import { OnInit, Component, Input, Inject, ElementRef, ViewChild, forwardRef, ChangeDetectorRef } from '@angular/core'; -import { AngularDisposable } from 'sql/base/common/lifecycle'; +import { AngularDisposable } from 'sql/base/node/lifecycle'; import { ICellModel } from 'sql/parts/notebook/models/modelInterfaces'; import * as themeColors from 'vs/workbench/common/theme'; import { IWorkbenchThemeService, IColorTheme } from 'vs/workbench/services/themes/common/workbenchThemeService'; diff --git a/src/sql/parts/notebook/models/clientSession.ts b/src/sql/parts/notebook/models/clientSession.ts index 34e46d9654..c05dacd808 100644 --- a/src/sql/parts/notebook/models/clientSession.ts +++ b/src/sql/parts/notebook/models/clientSession.ts @@ -18,8 +18,8 @@ import { Deferred } from 'sql/base/common/promise'; import * as notebookUtils from '../notebookUtils'; import * as sparkUtils from '../spark/sparkUtils'; -import { INotebookManager } from 'sql/services/notebook/notebookService'; -import { IConnectionProfile } from 'sql/parts/connection/common/interfaces'; +import { INotebookManager } from 'sql/workbench/services/notebook/common/notebookService'; +import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; import { NotebookConnection } from 'sql/parts/notebook/models/notebookConnection'; /** @@ -266,7 +266,7 @@ export class ClientSession implements IClientSession { let server = URI.parse(sparkUtils.getLivyUrl(this._connection.host, this._connection.knoxport)).toString(); let doNotCallChangeEndpointParams = - `%_do_not_call_change_endpoint --username=${this._connection.user} --password=${this._connection.password} --server=${server} --auth=Basic_Access`; + `%_do_not_call_change_endpoint --username=${this._connection.user} --password=${this._connection.password} --server=${server} --auth=Basic_Access`; let future = this._session.kernel.requestExecute({ code: doNotCallChangeEndpointParams }, true); diff --git a/src/sql/parts/notebook/models/modelInterfaces.ts b/src/sql/parts/notebook/models/modelInterfaces.ts index 0f664a8e77..575a15a1eb 100644 --- a/src/sql/parts/notebook/models/modelInterfaces.ts +++ b/src/sql/parts/notebook/models/modelInterfaces.ts @@ -15,10 +15,10 @@ import URI from 'vs/base/common/uri'; import { INotificationService } from 'vs/platform/notification/common/notification'; import { CellType, NotebookChangeType } from 'sql/parts/notebook/models/contracts'; -import { INotebookManager } from 'sql/services/notebook/notebookService'; -import { IConnectionProfile } from 'sql/parts/connection/common/interfaces'; +import { INotebookManager } from 'sql/workbench/services/notebook/common/notebookService'; +import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; import { NotebookConnection } from 'sql/parts/notebook/models/notebookConnection'; -import { IConnectionManagementService } from 'sql/parts/connection/common/connectionManagement'; +import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement'; import { ISingleNotebookEditOperation } from 'sql/workbench/api/common/sqlExtHostTypes'; export interface IClientSessionOptions { diff --git a/src/sql/parts/notebook/models/notebookConnection.ts b/src/sql/parts/notebook/models/notebookConnection.ts index 60b778669b..c03ca0e6f6 100644 --- a/src/sql/parts/notebook/models/notebookConnection.ts +++ b/src/sql/parts/notebook/models/notebookConnection.ts @@ -8,7 +8,7 @@ import { localize } from 'vs/nls'; -import { IConnectionProfile } from 'sql/parts/connection/common/interfaces'; +import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; export namespace constants { export const hostPropName = 'host'; diff --git a/src/sql/parts/notebook/models/notebookModel.ts b/src/sql/parts/notebook/models/notebookModel.ts index e264af8a24..9e5c124d49 100644 --- a/src/sql/parts/notebook/models/notebookModel.ts +++ b/src/sql/parts/notebook/models/notebookModel.ts @@ -13,12 +13,12 @@ import { Disposable } from 'vs/base/common/lifecycle'; import { CellModel } from './cell'; import { IClientSession, INotebookModel, IDefaultConnection, INotebookModelOptions, ICellModel, notebookConstants, NotebookContentChange } from './modelInterfaces'; -import { NotebookChangeType, CellTypes, CellType } from 'sql/parts/notebook/models/contracts'; +import { NotebookChangeType, CellType } from 'sql/parts/notebook/models/contracts'; import { nbversion } from '../notebookConstants'; import * as notebookUtils from '../notebookUtils'; -import { INotebookManager, SQL_NOTEBOOK_PROVIDER, DEFAULT_NOTEBOOK_PROVIDER } from 'sql/services/notebook/notebookService'; +import { INotebookManager, SQL_NOTEBOOK_PROVIDER, DEFAULT_NOTEBOOK_PROVIDER } from 'sql/workbench/services/notebook/common/notebookService'; import { SparkMagicContexts } from 'sql/parts/notebook/models/sparkMagicContexts'; -import { IConnectionProfile } from 'sql/parts/connection/common/interfaces'; +import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; import { NotebookConnection } from 'sql/parts/notebook/models/notebookConnection'; import { INotification, Severity } from 'vs/platform/notification/common/notification'; import { Schemas } from 'vs/base/common/network'; @@ -88,10 +88,10 @@ export class NotebookModel extends Disposable implements INotebookModel { return this.notebookManagers.find(manager => manager.providerId === this._providerId); } - public get notebookUri() : URI { + public get notebookUri(): URI { return this.notebookOptions.notebookUri; } - public set notebookUri(value : URI) { + public set notebookUri(value: URI) { this.notebookOptions.notebookUri = value; } diff --git a/src/sql/parts/notebook/models/sparkMagicContexts.ts b/src/sql/parts/notebook/models/sparkMagicContexts.ts index a7cccca5b3..5c89f84745 100644 --- a/src/sql/parts/notebook/models/sparkMagicContexts.ts +++ b/src/sql/parts/notebook/models/sparkMagicContexts.ts @@ -10,11 +10,11 @@ import { nb } from 'sqlops'; import * as pfs from 'vs/base/node/pfs'; import { localize } from 'vs/nls'; -import { IConnectionProfile } from 'sql/parts/connection/common/interfaces'; +import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; import { IDefaultConnection, notebookConstants, INotebookModelOptions } from 'sql/parts/notebook/models/modelInterfaces'; import * as notebookUtils from '../notebookUtils'; import { INotificationService } from 'vs/platform/notification/common/notification'; -import { IConnectionManagementService } from 'sql/parts/connection/common/connectionManagement'; +import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement'; const configBase = { 'kernel_python_credentials': { @@ -155,7 +155,7 @@ export class SparkMagicContexts { // Default to localhost in config file. let creds: ICredentials = { - 'url': 'http://localhost:8088' + 'url': 'http://localhost:8088' }; let config: ISparkMagicConfig = Object.assign({}, configBase); diff --git a/src/sql/parts/notebook/notebook.component.ts b/src/sql/parts/notebook/notebook.component.ts index f4b02b8e30..c669499f95 100644 --- a/src/sql/parts/notebook/notebook.component.ts +++ b/src/sql/parts/notebook/notebook.component.ts @@ -3,7 +3,7 @@ * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import './notebookStyles'; +import 'sql/parts/notebook/notebookStyles'; import { OnInit, Component, Inject, forwardRef, ElementRef, ChangeDetectorRef, ViewChild, OnDestroy } from '@angular/core'; @@ -30,17 +30,17 @@ import { IViewletService } from 'vs/workbench/services/viewlet/browser/viewlet'; import { VIEWLET_ID, IExtensionsViewlet } from 'vs/workbench/parts/extensions/common/extensions'; import { CommonServiceInterface } from 'sql/services/common/commonServiceInterface.service'; -import { AngularDisposable } from 'sql/base/common/lifecycle'; +import { AngularDisposable } from 'sql/base/node/lifecycle'; import { CellTypes, CellType } from 'sql/parts/notebook/models/contracts'; import { ICellModel, IModelFactory, notebookConstants, INotebookModel, NotebookContentChange } from 'sql/parts/notebook/models/modelInterfaces'; -import { IConnectionManagementService, IConnectionDialogService } from 'sql/parts/connection/common/connectionManagement'; -import { INotebookService, INotebookParams, INotebookManager, INotebookEditor, DEFAULT_NOTEBOOK_FILETYPE, DEFAULT_NOTEBOOK_PROVIDER, SQL_NOTEBOOK_PROVIDER } from 'sql/services/notebook/notebookService'; +import { IConnectionManagementService, IConnectionDialogService } from 'sql/platform/connection/common/connectionManagement'; +import { INotebookService, INotebookParams, INotebookManager, INotebookEditor, DEFAULT_NOTEBOOK_FILETYPE, DEFAULT_NOTEBOOK_PROVIDER, SQL_NOTEBOOK_PROVIDER } from 'sql/workbench/services/notebook/common/notebookService'; import { IBootstrapParams } from 'sql/services/bootstrap/bootstrapService'; import { NotebookModel } from 'sql/parts/notebook/models/notebookModel'; import { ModelFactory } from 'sql/parts/notebook/models/modelFactory'; import * as notebookUtils from 'sql/parts/notebook/notebookUtils'; import { Deferred } from 'sql/base/common/promise'; -import { IConnectionProfile } from 'sql/parts/connection/common/interfaces'; +import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; import { Taskbar } from 'sql/base/browser/ui/taskbar/taskbar'; import { KernelsDropdown, AttachToDropdown, AddCellAction, TrustedAction, SaveNotebookAction } from 'sql/parts/notebook/notebookActions'; import { IObjectExplorerService } from 'sql/parts/objectExplorer/common/objectExplorerService'; @@ -137,7 +137,7 @@ export class NotebookComponent extends AngularDisposable implements OnInit, OnDe } public get activeCellId(): string { - return this._model && this._model.activeCell ? this._model.activeCell.id : ''; + return this._model && this._model.activeCell ? this._model.activeCell.id : ''; } public get modelRegistered(): Promise { @@ -175,15 +175,13 @@ export class NotebookComponent extends AngularDisposable implements OnInit, OnDe } // Add cell based on cell type - public addCell(cellType: CellType) - { + public addCell(cellType: CellType) { let newCell = this._model.addCell(cellType); this.selectCell(newCell); } // Updates Notebook model's trust details - public updateModelTrustDetails(isTrusted: boolean) - { + public updateModelTrustDetails(isTrusted: boolean) { this._model.trustedMode = isTrusted; this._model.cells.forEach(cell => { cell.trustedMode = isTrusted; @@ -258,7 +256,7 @@ export class NotebookComponent extends AngularDisposable implements OnInit, OnDe await this.notebookService.registrationComplete; // Refresh the provider if we had been using default if (DEFAULT_NOTEBOOK_PROVIDER === this._notebookParams.providerId) { - let providers= notebookUtils.getProvidersForFileName(this._notebookParams.notebookUri.fsPath, this.notebookService); + let providers = notebookUtils.getProvidersForFileName(this._notebookParams.notebookUri.fsPath, this.notebookService); let tsqlProvider = providers.find(provider => provider === SQL_NOTEBOOK_PROVIDER); this._notebookParams.providerId = tsqlProvider ? SQL_NOTEBOOK_PROVIDER : providers[0]; } @@ -284,10 +282,8 @@ export class NotebookComponent extends AngularDisposable implements OnInit, OnDe } // Updates toolbar components - private updateToolbarComponents(isTrusted: boolean) - { - if(this._trustedAction) - { + private updateToolbarComponents(isTrusted: boolean) { + if (this._trustedAction) { this._trustedAction.enabled = true; this._trustedAction.trusted = isTrusted; } @@ -336,7 +332,7 @@ export class NotebookComponent extends AngularDisposable implements OnInit, OnDe let addCodeCellButton = new AddCellAction('notebook.AddCodeCell', localize('code', 'Code'), 'notebook-button icon-add'); addCodeCellButton.cellType = CellTypes.Code; - let addTextCellButton = new AddCellAction('notebook.AddTextCell',localize('text', 'Text'), 'notebook-button icon-add'); + let addTextCellButton = new AddCellAction('notebook.AddTextCell', localize('text', 'Text'), 'notebook-button icon-add'); addTextCellButton.cellType = CellTypes.Markdown; this._trustedAction = this.instantiationService.createInstance(TrustedAction, 'notebook.Trusted'); @@ -353,10 +349,10 @@ export class NotebookComponent extends AngularDisposable implements OnInit, OnDe let groups = notebookBarMenu.getActions({ arg: null, shouldForwardArgs: true }); let primary: IAction[] = []; let secondary: IAction[] = []; - fillInActions(groups, {primary, secondary}, false, (group: string) => group === undefined); + fillInActions(groups, { primary, secondary }, false, (group: string) => group === undefined); let taskbar = this.toolbar.nativeElement; - this._actionBar = new Taskbar(taskbar, this.contextMenuService, { actionItemProvider: action => this.actionItemProvider(action as Action)}); + this._actionBar = new Taskbar(taskbar, this.contextMenuService, { actionItemProvider: action => this.actionItemProvider(action as Action) }); this._actionBar.context = this; this._actionBar.setContent([ { element: kernelContainer }, @@ -393,8 +389,8 @@ export class NotebookComponent extends AngularDisposable implements OnInit, OnDe promptForPath(defaultPath: string): TPromise { return this.windowService.showSaveDialog({ defaultPath: defaultPath, - filters: [{ name: localize('notebookFile', 'Notebook'), extensions: ['ipynb']}] - }); + filters: [{ name: localize('notebookFile', 'Notebook'), extensions: ['ipynb'] }] + }); } // Entry point to save notebook @@ -409,12 +405,11 @@ export class NotebookComponent extends AngularDisposable implements OnInit, OnDe let resource = self._model.notebookUri; self._model.notebookUri = target; this.saveNotebook().then(result => { - if(result) - { + if (result) { return this.replaceUntitledNotebookEditor(resource, target); } return result; - }); + }); } return false; // User clicks cancel }); @@ -459,7 +454,7 @@ export class NotebookComponent extends AngularDisposable implements OnInit, OnDe } private setDirty(isDirty: boolean): void { - if(this._notebookParams.input){ + if (this._notebookParams.input) { this._notebookParams.input.setDirty(isDirty); } } diff --git a/src/sql/parts/notebook/notebookActions.ts b/src/sql/parts/notebook/notebookActions.ts index cb1dfc66c0..2b653ab4c6 100644 --- a/src/sql/parts/notebook/notebookActions.ts +++ b/src/sql/parts/notebook/notebookActions.ts @@ -15,10 +15,10 @@ import { SelectBox, ISelectBoxOptionsWithLabel } from 'sql/base/browser/ui/selec import { INotebookModel, notebookConstants } from 'sql/parts/notebook/models/modelInterfaces'; import { CellType } from 'sql/parts/notebook/models/contracts'; import { NotebookComponent } from 'sql/parts/notebook/notebook.component'; -import { IConnectionProfile } from 'sql/parts/connection/common/interfaces'; -import { IConnectionManagementService, IConnectionDialogService } from 'sql/parts/connection/common/connectionManagement'; +import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; +import { IConnectionManagementService, IConnectionDialogService } from 'sql/platform/connection/common/connectionManagement'; import { getErrorMessage } from 'sql/parts/notebook/notebookUtils'; -import { noKernel } from 'sql/services/notebook/sessionManager'; +import { noKernel } from 'sql/workbench/services/notebook/common/sessionManager'; const msgLoading = localize('loading', 'Loading kernels...'); const kernelLabel: string = localize('Kernel', 'Kernel: '); @@ -284,11 +284,11 @@ export class AttachToDropdown extends SelectBox { } /** - * Open connection dialog - * Enter server details and connect to a server from the dialog - * Bind the server value to 'Attach To' drop down - * Connected server is displayed at the top of drop down - **/ + * Open connection dialog + * Enter server details and connect to a server from the dialog + * Bind the server value to 'Attach To' drop down + * Connected server is displayed at the top of drop down + **/ public async openConnectionDialog(): Promise { try { //TODO: Figure out how to plumb through the correct provider here diff --git a/src/sql/parts/notebook/notebookEditor.ts b/src/sql/parts/notebook/notebookEditor.ts index 013ca227e8..13c0cc04f9 100644 --- a/src/sql/parts/notebook/notebookEditor.ts +++ b/src/sql/parts/notebook/notebookEditor.ts @@ -16,7 +16,7 @@ import { CancellationToken } from 'vs/base/common/cancellation'; import { NotebookInput } from 'sql/parts/notebook/notebookInput'; import { NotebookModule } from 'sql/parts/notebook/notebook.module'; import { NOTEBOOK_SELECTOR } from 'sql/parts/notebook/notebook.component'; -import { INotebookParams, DEFAULT_NOTEBOOK_PROVIDER } from 'sql/services/notebook/notebookService'; +import { INotebookParams, DEFAULT_NOTEBOOK_PROVIDER } from 'sql/workbench/services/notebook/common/notebookService'; export class NotebookEditor extends BaseEditor { diff --git a/src/sql/parts/notebook/notebookInput.ts b/src/sql/parts/notebook/notebookInput.ts index 46e1b749d1..7b66fe539e 100644 --- a/src/sql/parts/notebook/notebookInput.ts +++ b/src/sql/parts/notebook/notebookInput.ts @@ -14,7 +14,7 @@ import URI from 'vs/base/common/uri'; import { IContextKeyService, ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey'; import * as resources from 'vs/base/common/resources'; -import { INotebookService, INotebookEditor } from 'sql/services/notebook/notebookService'; +import { INotebookService, INotebookEditor } from 'sql/workbench/services/notebook/common/notebookService'; import { IDialogService } from 'vs/platform/dialogs/common/dialogs'; import Severity from 'vs/base/common/severity'; @@ -80,7 +80,7 @@ export class NotebookInputModel extends EditorModel { export class NotebookInputValidator { - constructor(@IContextKeyService private readonly _contextKeyService: IContextKeyService) {} + constructor( @IContextKeyService private readonly _contextKeyService: IContextKeyService) { } public isNotebookEnabled(): boolean { return this._contextKeyService.contextMatchesRules(notebooksEnabledCondition); @@ -202,14 +202,12 @@ export class NotebookInput extends EditorInput { save(): TPromise { let activeEditor: INotebookEditor; for (const editor of this.notebookService.listNotebookEditors()) { - if(editor.isActive()) - { + if (editor.isActive()) { activeEditor = editor; } } - if(activeEditor) - { - return TPromise.wrap(activeEditor.save().then((val) => {return val;})); + if (activeEditor) { + return TPromise.wrap(activeEditor.save().then((val) => { return val; })); } return TPromise.wrap(false); } diff --git a/src/sql/parts/notebook/notebookUtils.ts b/src/sql/parts/notebook/notebookUtils.ts index b1bef9eb66..16d32a5af9 100644 --- a/src/sql/parts/notebook/notebookUtils.ts +++ b/src/sql/parts/notebook/notebookUtils.ts @@ -11,7 +11,7 @@ import * as os from 'os'; import * as pfs from 'vs/base/node/pfs'; import { localize } from 'vs/nls'; import { IOutputChannel } from 'vs/workbench/parts/output/common/output'; -import { DEFAULT_NOTEBOOK_PROVIDER, DEFAULT_NOTEBOOK_FILETYPE, INotebookService } from 'sql/services/notebook/notebookService'; +import { DEFAULT_NOTEBOOK_PROVIDER, DEFAULT_NOTEBOOK_FILETYPE, INotebookService } from 'sql/workbench/services/notebook/common/notebookService'; /** @@ -44,7 +44,7 @@ export function getProvidersForFileName(fileName: string, notebookService: INote let providers: string[]; // First try to get provider for actual file type if (fileExt && fileExt.startsWith('.')) { - fileExt = fileExt.slice(1,fileExt.length); + fileExt = fileExt.slice(1, fileExt.length); providers = notebookService.getProvidersForFileType(fileExt); } // Fallback to provider for default file type (assume this is a global handler) diff --git a/src/sql/parts/objectExplorer/common/objectExplorerService.ts b/src/sql/parts/objectExplorer/common/objectExplorerService.ts index cd7e3fcfde..87a1c67de0 100644 --- a/src/sql/parts/objectExplorer/common/objectExplorerService.ts +++ b/src/sql/parts/objectExplorer/common/objectExplorerService.ts @@ -6,11 +6,11 @@ import { NodeType } from 'sql/parts/objectExplorer/common/nodeType'; import { TreeNode, TreeItemCollapsibleState } from 'sql/parts/objectExplorer/common/treeNode'; -import { ConnectionProfile } from 'sql/parts/connection/common/connectionProfile'; +import { ConnectionProfile } from 'sql/platform/connection/common/connectionProfile'; import { IDisposable, dispose } from 'vs/base/common/lifecycle'; import { createDecorator } from 'vs/platform/instantiation/common/instantiation'; -import { IConnectionManagementService } from 'sql/parts/connection/common/connectionManagement'; -import { IConnectionProfile } from 'sql/parts/connection/common/interfaces'; +import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement'; +import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; import { Event, Emitter } from 'vs/base/common/event'; import * as sqlops from 'sqlops'; import * as nls from 'vs/nls'; @@ -19,8 +19,8 @@ import * as TelemetryUtils from 'sql/common/telemetryUtilities'; import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry'; import { warn, error } from 'sql/base/common/log'; import { ServerTreeView } from 'sql/parts/objectExplorer/viewlet/serverTreeView'; -import { ICapabilitiesService } from 'sql/services/capabilities/capabilitiesService'; -import * as Utils from 'sql/parts/connection/common/utils'; +import { ICapabilitiesService } from 'sql/platform/capabilities/common/capabilitiesService'; +import * as Utils from 'sql/platform/connection/common/utils'; export const SERVICE_ID = 'ObjectExplorerService'; diff --git a/src/sql/parts/objectExplorer/common/registeredServer.contribution.ts b/src/sql/parts/objectExplorer/common/registeredServer.contribution.ts index 6be4c2ce88..f0df4c3282 100644 --- a/src/sql/parts/objectExplorer/common/registeredServer.contribution.ts +++ b/src/sql/parts/objectExplorer/common/registeredServer.contribution.ts @@ -14,8 +14,8 @@ import { IViewletService } from 'vs/workbench/services/viewlet/browser/viewlet'; import { Registry } from 'vs/platform/registry/common/platform'; import { Extensions, IConfigurationRegistry } from 'vs/platform/configuration/common/configurationRegistry'; -import { VIEWLET_ID } from 'sql/parts/connection/common/connectionManagement'; -import { ConnectionViewlet } from 'sql/parts/objectExplorer/viewlet/connectionViewlet'; +import { VIEWLET_ID } from 'sql/platform/connection/common/connectionManagement'; +import { ConnectionViewlet } from 'sql/workbench/parts/connection/electron-browser/connectionViewlet'; import { IEditorGroupsService } from 'vs/workbench/services/group/common/editorGroupsService'; // Viewlet Action diff --git a/src/sql/parts/objectExplorer/common/treeNode.ts b/src/sql/parts/objectExplorer/common/treeNode.ts index 0f10514c2b..a6ab7e7b03 100644 --- a/src/sql/parts/objectExplorer/common/treeNode.ts +++ b/src/sql/parts/objectExplorer/common/treeNode.ts @@ -5,7 +5,7 @@ 'use strict'; -import { ConnectionProfile } from 'sql/parts/connection/common/connectionProfile'; +import { ConnectionProfile } from 'sql/platform/connection/common/connectionProfile'; import { NodeType, SqlThemeIcon } from 'sql/parts/objectExplorer/common/nodeType'; import * as sqlops from 'sqlops'; @@ -139,7 +139,7 @@ export class TreeNode { } public toNodeInfo(): sqlops.NodeInfo { - return { + return { nodePath: this.nodePath, nodeType: this.nodeTypeId, nodeSubType: this.nodeSubType, diff --git a/src/sql/parts/objectExplorer/serverGroupDialog/serverGroupViewModel.ts b/src/sql/parts/objectExplorer/serverGroupDialog/serverGroupViewModel.ts index 4e2dc4207e..6a4d6df66a 100644 --- a/src/sql/parts/objectExplorer/serverGroupDialog/serverGroupViewModel.ts +++ b/src/sql/parts/objectExplorer/serverGroupDialog/serverGroupViewModel.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; -import { IConnectionProfileGroup } from 'sql/parts/connection/common/connectionProfileGroup'; +import { IConnectionProfileGroup } from 'sql/platform/connection/common/connectionProfileGroup'; import * as TypeChecker from 'vs/base/common/types'; import { localize } from 'vs/nls'; diff --git a/src/sql/parts/objectExplorer/viewlet/connectionTreeAction.ts b/src/sql/parts/objectExplorer/viewlet/connectionTreeAction.ts index 821e2e18e3..6b4be813a3 100644 --- a/src/sql/parts/objectExplorer/viewlet/connectionTreeAction.ts +++ b/src/sql/parts/objectExplorer/viewlet/connectionTreeAction.ts @@ -6,22 +6,23 @@ import { localize } from 'vs/nls'; import { TPromise } from 'vs/base/common/winjs.base'; import { Action } from 'vs/base/common/actions'; -import { ConnectionProfile } from 'sql/parts/connection/common/connectionProfile'; -import { IConnectionManagementService, IErrorMessageService } from 'sql/parts/connection/common/connectionManagement'; -import { ICapabilitiesService } from 'sql/services/capabilities/capabilitiesService'; +import { ConnectionProfile } from 'sql/platform/connection/common/connectionProfile'; +import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement'; +import { ICapabilitiesService } from 'sql/platform/capabilities/common/capabilitiesService'; import { IQueryEditorService } from 'sql/parts/query/common/queryEditorService'; import { ServerTreeView } from 'sql/parts/objectExplorer/viewlet/serverTreeView'; -import { ConnectionViewlet } from 'sql/parts/objectExplorer/viewlet/connectionViewlet'; -import { IConnectionProfile } from 'sql/parts/connection/common/interfaces'; -import { ConnectionProfileGroup } from 'sql/parts/connection/common/connectionProfileGroup'; +import { ConnectionViewlet } from 'sql/workbench/parts/connection/electron-browser/connectionViewlet'; +import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; +import { ConnectionProfileGroup } from 'sql/platform/connection/common/connectionProfileGroup'; import * as TaskUtilities from 'sql/workbench/common/taskUtilities'; import { ITree } from 'vs/base/parts/tree/browser/tree'; -import * as Constants from 'sql/parts/connection/common/constants'; +import * as Constants from 'sql/platform/connection/common/constants'; import { IObjectExplorerService } from 'sql/parts/objectExplorer/common/objectExplorerService'; import { TreeNode } from 'sql/parts/objectExplorer/common/treeNode'; import Severity from 'vs/base/common/severity'; import { ObjectExplorerActionsContext } from 'sql/parts/objectExplorer/viewlet/objectExplorerActions'; import { IEditorService } from 'vs/workbench/services/editor/common/editorService'; +import { IErrorMessageService } from 'sql/platform/errorMessage/common/errorMessageService'; export class RefreshAction extends Action { diff --git a/src/sql/parts/objectExplorer/viewlet/dragAndDropController.ts b/src/sql/parts/objectExplorer/viewlet/dragAndDropController.ts index 1c1b2ac978..9a5487efbf 100644 --- a/src/sql/parts/objectExplorer/viewlet/dragAndDropController.ts +++ b/src/sql/parts/objectExplorer/viewlet/dragAndDropController.ts @@ -4,12 +4,12 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; -import { ConnectionProfileGroup } from 'sql/parts/connection/common/connectionProfileGroup'; -import { ConnectionProfile } from 'sql/parts/connection/common/connectionProfile'; +import { ConnectionProfileGroup } from 'sql/platform/connection/common/connectionProfileGroup'; +import { ConnectionProfile } from 'sql/platform/connection/common/connectionProfile'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; -import { IConnectionManagementService } from 'sql/parts/connection/common/connectionManagement'; +import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement'; import { ITree, IDragAndDrop, IDragAndDropData, IDragOverReaction, DRAG_OVER_ACCEPT_BUBBLE_DOWN, DRAG_OVER_REJECT } from 'vs/base/parts/tree/browser/tree'; -import * as Constants from 'sql/parts/connection/common/constants'; +import * as Constants from 'sql/platform/connection/common/constants'; import { DragMouseEvent } from 'vs/base/browser/mouseEvent'; import { TreeUpdateUtils } from 'sql/parts/objectExplorer/viewlet/treeUpdateUtils'; diff --git a/src/sql/parts/objectExplorer/viewlet/objectExplorerActions.ts b/src/sql/parts/objectExplorer/viewlet/objectExplorerActions.ts index 23a2983d5f..af7c1bc1ab 100644 --- a/src/sql/parts/objectExplorer/viewlet/objectExplorerActions.ts +++ b/src/sql/parts/objectExplorer/viewlet/objectExplorerActions.ts @@ -12,7 +12,7 @@ import { ExecuteCommandAction } from 'vs/platform/actions/common/actions'; import { ICommandService } from 'vs/platform/commands/common/commands'; import * as sqlops from 'sqlops'; -import { IConnectionManagementService, IConnectionCompletionOptions, IErrorMessageService } from 'sql/parts/connection/common/connectionManagement'; +import { IConnectionManagementService, IConnectionCompletionOptions } from 'sql/platform/connection/common/connectionManagement'; import { TreeNode } from 'sql/parts/objectExplorer/common/treeNode'; import { ScriptSelectAction, EditDataAction, ScriptCreateAction, @@ -22,13 +22,14 @@ import { NodeType } from 'sql/parts/objectExplorer/common/nodeType'; import { TreeUpdateUtils } from 'sql/parts/objectExplorer/viewlet/treeUpdateUtils'; import { TreeSelectionHandler } from 'sql/parts/objectExplorer/viewlet/treeSelectionHandler'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; -import { IScriptingService } from 'sql/services/scripting/scriptingService'; +import { IScriptingService } from 'sql/platform/scripting/common/scriptingService'; import { IQueryEditorService } from 'sql/parts/query/common/queryEditorService'; import { IObjectExplorerService } from 'sql/parts/objectExplorer/common/objectExplorerService'; -import * as Constants from 'sql/parts/connection/common/constants'; -import { IConnectionProfile } from 'sql/parts/connection/common/interfaces'; -import { ICapabilitiesService } from 'sql/services/capabilities/capabilitiesService'; -import { ConnectionProfile } from 'sql/parts/connection/common/connectionProfile'; +import * as Constants from 'sql/platform/connection/common/constants'; +import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; +import { ICapabilitiesService } from 'sql/platform/capabilities/common/capabilitiesService'; +import { ConnectionProfile } from 'sql/platform/connection/common/connectionProfile'; +import { IErrorMessageService } from 'sql/platform/errorMessage/common/errorMessageService'; export class ObjectExplorerActionsContext implements sqlops.ObjectExplorerContext { diff --git a/src/sql/parts/objectExplorer/viewlet/recentConnectionDataSource.ts b/src/sql/parts/objectExplorer/viewlet/recentConnectionDataSource.ts index 7abdca61c5..6be9cb262f 100644 --- a/src/sql/parts/objectExplorer/viewlet/recentConnectionDataSource.ts +++ b/src/sql/parts/objectExplorer/viewlet/recentConnectionDataSource.ts @@ -4,8 +4,8 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; -import { ConnectionProfileGroup } from 'sql/parts/connection/common/connectionProfileGroup'; -import { ConnectionProfile } from 'sql/parts/connection/common/connectionProfile'; +import { ConnectionProfileGroup } from 'sql/platform/connection/common/connectionProfileGroup'; +import { ConnectionProfile } from 'sql/platform/connection/common/connectionProfile'; import { ITree, IDataSource } from 'vs/base/parts/tree/browser/tree'; import { TPromise } from 'vs/base/common/winjs.base'; diff --git a/src/sql/parts/objectExplorer/viewlet/serverTreeActionProvider.ts b/src/sql/parts/objectExplorer/viewlet/serverTreeActionProvider.ts index cad4343db2..2c11dc3d9b 100644 --- a/src/sql/parts/objectExplorer/viewlet/serverTreeActionProvider.ts +++ b/src/sql/parts/objectExplorer/viewlet/serverTreeActionProvider.ts @@ -22,17 +22,17 @@ import { } from 'sql/parts/objectExplorer/viewlet/objectExplorerActions'; import { TreeNode } from 'sql/parts/objectExplorer/common/treeNode'; import { NodeType } from 'sql/parts/objectExplorer/common/nodeType'; -import { ConnectionProfileGroup } from 'sql/parts/connection/common/connectionProfileGroup'; -import { ConnectionProfile } from 'sql/parts/connection/common/connectionProfile'; +import { ConnectionProfileGroup } from 'sql/platform/connection/common/connectionProfileGroup'; +import { ConnectionProfile } from 'sql/platform/connection/common/connectionProfile'; import { TreeUpdateUtils } from 'sql/parts/objectExplorer/viewlet/treeUpdateUtils'; -import { IConnectionManagementService } from 'sql/parts/connection/common/connectionManagement'; +import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement'; import { MenuId, IMenuService } from 'vs/platform/actions/common/actions'; import { NewQueryAction, BackupAction, RestoreAction } from 'sql/workbench/common/actions'; import { ConnectionContextKey } from 'sql/parts/connection/common/connectionContextKey'; import { IContextMenuService } from 'vs/platform/contextview/browser/contextView'; -import { TreeNodeContextKey } from './treeNodeContextKey'; -import { IQueryManagementService } from 'sql/parts/query/common/queryManagement'; -import { IScriptingService } from 'sql/services/scripting/scriptingService'; +import { TreeNodeContextKey } from 'sql/parts/objectExplorer/viewlet/treeNodeContextKey'; +import { IQueryManagementService } from 'sql/platform/query/common/queryManagement'; +import { IScriptingService } from 'sql/platform/scripting/common/scriptingService'; import * as constants from 'sql/common/constants'; /** diff --git a/src/sql/parts/objectExplorer/viewlet/serverTreeController.ts b/src/sql/parts/objectExplorer/viewlet/serverTreeController.ts index 2ebb89806b..b00cc52f9e 100644 --- a/src/sql/parts/objectExplorer/viewlet/serverTreeController.ts +++ b/src/sql/parts/objectExplorer/viewlet/serverTreeController.ts @@ -12,8 +12,8 @@ import { IContextMenuService } from 'vs/platform/contextview/browser/contextView import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding'; import { IMouseEvent } from 'vs/base/browser/mouseEvent'; import { IKeyboardEvent } from 'vs/base/browser/keyboardEvent'; -import { ConnectionProfileGroup } from 'sql/parts/connection/common/connectionProfileGroup'; -import { ConnectionProfile } from 'sql/parts/connection/common/connectionProfile'; +import { ConnectionProfileGroup } from 'sql/platform/connection/common/connectionProfileGroup'; +import { ConnectionProfile } from 'sql/platform/connection/common/connectionProfile'; import { ServerTreeActionProvider } from 'sql/parts/objectExplorer/viewlet/serverTreeActionProvider'; import { ObjectExplorerActionsContext } from 'sql/parts/objectExplorer/viewlet/objectExplorerActions'; import { TreeNode } from 'sql/parts/objectExplorer/common/treeNode'; diff --git a/src/sql/parts/objectExplorer/viewlet/serverTreeDataSource.ts b/src/sql/parts/objectExplorer/viewlet/serverTreeDataSource.ts index 8392186449..f9934d23af 100644 --- a/src/sql/parts/objectExplorer/viewlet/serverTreeDataSource.ts +++ b/src/sql/parts/objectExplorer/viewlet/serverTreeDataSource.ts @@ -4,15 +4,16 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; -import { ConnectionProfileGroup } from 'sql/parts/connection/common/connectionProfileGroup'; -import { ConnectionProfile } from 'sql/parts/connection/common/connectionProfile'; +import { ConnectionProfileGroup } from 'sql/platform/connection/common/connectionProfileGroup'; +import { ConnectionProfile } from 'sql/platform/connection/common/connectionProfile'; import { ITree, IDataSource } from 'vs/base/parts/tree/browser/tree'; import { TreeNode, TreeItemCollapsibleState } from 'sql/parts/objectExplorer/common/treeNode'; import { IObjectExplorerService } from 'sql/parts/objectExplorer/common/objectExplorerService'; import { TPromise } from 'vs/base/common/winjs.base'; import { TreeUpdateUtils } from 'sql/parts/objectExplorer/viewlet/treeUpdateUtils'; -import { IConnectionManagementService, IErrorMessageService } from 'sql/parts/connection/common/connectionManagement'; +import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement'; import Severity from 'vs/base/common/severity'; +import { IErrorMessageService } from 'sql/platform/errorMessage/common/errorMessageService'; /** * Implements the DataSource(that returns a parent/children of an element) for the server tree diff --git a/src/sql/parts/objectExplorer/viewlet/serverTreeRenderer.ts b/src/sql/parts/objectExplorer/viewlet/serverTreeRenderer.ts index 3f0aaec2ad..350e05f714 100644 --- a/src/sql/parts/objectExplorer/viewlet/serverTreeRenderer.ts +++ b/src/sql/parts/objectExplorer/viewlet/serverTreeRenderer.ts @@ -9,12 +9,12 @@ import 'vs/css!sql/media/icons/common-icons'; import * as dom from 'vs/base/browser/dom'; import { localize } from 'vs/nls'; -import { ConnectionProfileGroup } from 'sql/parts/connection/common/connectionProfileGroup'; -import { ConnectionProfile } from 'sql/parts/connection/common/connectionProfile'; +import { ConnectionProfileGroup } from 'sql/platform/connection/common/connectionProfileGroup'; +import { ConnectionProfile } from 'sql/platform/connection/common/connectionProfile'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; import { ITree, IRenderer } from 'vs/base/parts/tree/browser/tree'; import { IConnectionProfileGroupTemplateData, IConnectionTemplateData, IObjectExplorerTemplateData } from 'sql/parts/objectExplorer/viewlet/templateData'; -import { IConnectionManagementService } from 'sql/parts/connection/common/connectionManagement'; +import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement'; import { IContextViewService } from 'vs/platform/contextview/browser/contextView'; import { IThemeService } from 'vs/platform/theme/common/themeService'; import { TreeNode } from 'sql/parts/objectExplorer/common/treeNode'; diff --git a/src/sql/parts/objectExplorer/viewlet/serverTreeView.ts b/src/sql/parts/objectExplorer/viewlet/serverTreeView.ts index ca0aa8cd29..cb0f51a0ad 100644 --- a/src/sql/parts/objectExplorer/viewlet/serverTreeView.ts +++ b/src/sql/parts/objectExplorer/viewlet/serverTreeView.ts @@ -13,24 +13,24 @@ import { attachListStyler } from 'vs/platform/theme/common/styler'; import { ITree } from 'vs/base/parts/tree/browser/tree'; import { IDisposable, dispose } from 'vs/base/common/lifecycle'; import { localize } from 'vs/nls'; +import { IConfigurationService } from 'vs/platform/configuration/common/configuration'; -import { ConnectionProfileGroup } from 'sql/parts/connection/common/connectionProfileGroup'; -import { ConnectionProfile } from 'sql/parts/connection/common/connectionProfile'; -import * as ConnectionUtils from 'sql/parts/connection/common/utils'; +import { ConnectionProfileGroup } from 'sql/platform/connection/common/connectionProfileGroup'; +import { ConnectionProfile } from 'sql/platform/connection/common/connectionProfile'; +import * as ConnectionUtils from 'sql/platform/connection/common/utils'; import { ActiveConnectionsFilterAction } from 'sql/parts/objectExplorer/viewlet/connectionTreeAction'; -import { IConnectionManagementService, IErrorMessageService } from 'sql/parts/connection/common/connectionManagement'; +import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement'; import { TreeCreationUtils } from 'sql/parts/objectExplorer/viewlet/treeCreationUtils'; import { TreeUpdateUtils } from 'sql/parts/objectExplorer/viewlet/treeUpdateUtils'; import { TreeSelectionHandler } from 'sql/parts/objectExplorer/viewlet/treeSelectionHandler'; import { IObjectExplorerService } from 'sql/parts/objectExplorer/common/objectExplorerService'; -import { IConnectionProfile } from 'sql/parts/connection/common/interfaces'; -import { ICapabilitiesService } from 'sql/services/capabilities/capabilitiesService'; +import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; import { Button } from 'sql/base/browser/ui/button/button'; import { attachButtonStyler } from 'sql/common/theme/styler'; import { Event, Emitter } from 'vs/base/common/event'; import { TreeNode, TreeItemCollapsibleState } from 'sql/parts/objectExplorer/common/treeNode'; -import { IConfigurationService } from 'vs/platform/configuration/common/configuration'; import { SERVER_GROUP_CONFIG, SERVER_GROUP_AUTOEXPAND_CONFIG } from 'sql/parts/objectExplorer/serverGroupDialog/serverGroup.contribution'; +import { IErrorMessageService } from 'sql/platform/errorMessage/common/errorMessageService'; import { ServerTreeActionProvider } from 'sql/parts/objectExplorer/viewlet/serverTreeActionProvider'; const $ = builder.$; @@ -54,7 +54,6 @@ export class ServerTreeView { @IObjectExplorerService private _objectExplorerService: IObjectExplorerService, @IThemeService private _themeService: IThemeService, @IErrorMessageService private _errorMessageService: IErrorMessageService, - @ICapabilitiesService private _capabilitiesService: ICapabilitiesService, @IConfigurationService private _configurationService: IConfigurationService ) { this._activeConnectionsFilterAction = this._instantiationService.createInstance( diff --git a/src/sql/parts/objectExplorer/viewlet/templateData.ts b/src/sql/parts/objectExplorer/viewlet/templateData.ts index 1525d7f90e..a9c83d6719 100644 --- a/src/sql/parts/objectExplorer/viewlet/templateData.ts +++ b/src/sql/parts/objectExplorer/viewlet/templateData.ts @@ -2,7 +2,7 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { ConnectionProfile } from 'sql/parts/connection/common/connectionProfile'; +import { ConnectionProfile } from 'sql/platform/connection/common/connectionProfile'; import { InputBox } from 'vs/base/browser/ui/inputbox/inputBox'; import { TreeNode } from 'sql/parts/objectExplorer/common/treeNode'; diff --git a/src/sql/parts/objectExplorer/viewlet/treeSelectionHandler.ts b/src/sql/parts/objectExplorer/viewlet/treeSelectionHandler.ts index af3a655565..cdfc448c3f 100644 --- a/src/sql/parts/objectExplorer/viewlet/treeSelectionHandler.ts +++ b/src/sql/parts/objectExplorer/viewlet/treeSelectionHandler.ts @@ -3,9 +3,9 @@ * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { IConnectionManagementService, IConnectionCompletionOptions } from 'sql/parts/connection/common/connectionManagement'; +import { IConnectionManagementService, IConnectionCompletionOptions } from 'sql/platform/connection/common/connectionManagement'; import { ITree } from 'vs/base/parts/tree/browser/tree'; -import { ConnectionProfile } from 'sql/parts/connection/common/connectionProfile'; +import { ConnectionProfile } from 'sql/platform/connection/common/connectionProfile'; import { IObjectExplorerService } from 'sql/parts/objectExplorer/common/objectExplorerService'; import { IProgressService, IProgressRunner } from 'vs/platform/progress/common/progress'; diff --git a/src/sql/parts/objectExplorer/viewlet/treeUpdateUtils.ts b/src/sql/parts/objectExplorer/viewlet/treeUpdateUtils.ts index 332ef93a07..1507ef8238 100644 --- a/src/sql/parts/objectExplorer/viewlet/treeUpdateUtils.ts +++ b/src/sql/parts/objectExplorer/viewlet/treeUpdateUtils.ts @@ -3,17 +3,17 @@ * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { ConnectionProfileGroup } from 'sql/parts/connection/common/connectionProfileGroup'; -import { IConnectionManagementService, IConnectionCompletionOptions, IConnectionCallbacks } from 'sql/parts/connection/common/connectionManagement'; +import { ConnectionProfileGroup } from 'sql/platform/connection/common/connectionProfileGroup'; +import { IConnectionManagementService, IConnectionCompletionOptions, IConnectionCallbacks } from 'sql/platform/connection/common/connectionManagement'; import { ITree } from 'vs/base/parts/tree/browser/tree'; -import { ConnectionProfile } from 'sql/parts/connection/common/connectionProfile'; +import { ConnectionProfile } from 'sql/platform/connection/common/connectionProfile'; import { IObjectExplorerService } from 'sql/parts/objectExplorer/common/objectExplorerService'; import { NodeType } from 'sql/parts/objectExplorer/common/nodeType'; import { TPromise } from 'vs/base/common/winjs.base'; import { TreeNode } from 'sql/parts/objectExplorer/common/treeNode'; import errors = require('vs/base/common/errors'); -import { IConnectionProfile } from 'sql/parts/connection/common/interfaces'; +import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; export class TreeUpdateUtils { @@ -124,7 +124,7 @@ export class TreeUpdateUtils { if (connectionManagementService.isProfileConnecting(connection)) { resolve(undefined); - // else if we aren't connected or connecting then try to connect + // else if we aren't connected or connecting then try to connect } else { let callbacks: IConnectionCallbacks = undefined; if (tree) { diff --git a/src/sql/parts/profiler/contrib/profiler.contribution.ts b/src/sql/parts/profiler/contrib/profiler.contribution.ts index 0c765405d0..d14c6084eb 100644 --- a/src/sql/parts/profiler/contrib/profiler.contribution.ts +++ b/src/sql/parts/profiler/contrib/profiler.contribution.ts @@ -13,7 +13,7 @@ import * as nls from 'vs/nls'; import { ProfilerInput } from 'sql/parts/profiler/editor/profilerInput'; import { ProfilerEditor } from 'sql/parts/profiler/editor/profilerEditor'; -import { PROFILER_VIEW_TEMPLATE_SETTINGS, PROFILER_SESSION_TEMPLATE_SETTINGS, IProfilerViewTemplate, IProfilerSessionTemplate } from 'sql/parts/profiler/service/interfaces'; +import { PROFILER_VIEW_TEMPLATE_SETTINGS, PROFILER_SESSION_TEMPLATE_SETTINGS, IProfilerViewTemplate, IProfilerSessionTemplate } from 'sql/workbench/services/profiler/common/interfaces'; const profilerDescriptor = new EditorDescriptor( ProfilerEditor, diff --git a/src/sql/parts/profiler/contrib/profilerActions.contribution.ts b/src/sql/parts/profiler/contrib/profilerActions.contribution.ts index 8dbbd93ab1..68a68ca78b 100644 --- a/src/sql/parts/profiler/contrib/profilerActions.contribution.ts +++ b/src/sql/parts/profiler/contrib/profilerActions.contribution.ts @@ -6,31 +6,20 @@ import { CommandsRegistry } from 'vs/platform/commands/common/commands'; import { ServicesAccessor, IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; -import * as nls from 'vs/nls'; -import { IJSONSchema } from 'vs/base/common/jsonSchema'; import { IEditorService, ACTIVE_GROUP } from 'vs/workbench/services/editor/common/editorService'; -import { IConnectionManagementService, IConnectionDialogService } from 'sql/parts/connection/common/connectionManagement'; +import { IConnectionManagementService, IConnectionDialogService } from 'sql/platform/connection/common/connectionManagement'; import { IObjectExplorerService } from '../../objectExplorer/common/objectExplorerService'; import { ProfilerInput } from 'sql/parts/profiler/editor/profilerInput'; import { TPromise } from 'vs/base/common/winjs.base'; import * as TaskUtilities from 'sql/workbench/common/taskUtilities'; -import { IProfilerService } from '../service/interfaces'; +import { IProfilerService } from 'sql/workbench/services/profiler/common/interfaces'; import { KeybindingsRegistry, KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry'; import { KeyCode, KeyMod } from 'vs/editor/editor.api'; import { ProfilerEditor } from '../editor/profilerEditor'; import { ObjectExplorerActionsContext } from 'sql/parts/objectExplorer/viewlet/objectExplorerActions'; -import { ConnectionProfile } from 'sql/parts/connection/common/connectionProfile'; -import { ICapabilitiesService } from 'sql/services/capabilities/capabilitiesService'; -import { mssqlProviderName } from 'sql/parts/connection/common/constants'; - -// Contribute Global Actions -const category = nls.localize('profilerCategory', "Profiler"); - -const newProfilerSchema: IJSONSchema = { - description: nls.localize('carbon.actions.newProfiler', 'Open up a new profiler window'), - type: 'null', - default: null -}; +import { ConnectionProfile } from 'sql/platform/connection/common/connectionProfile'; +import { ICapabilitiesService } from 'sql/platform/capabilities/common/capabilitiesService'; +import { mssqlProviderName } from 'sql/platform/connection/common/constants'; CommandsRegistry.registerCommand({ id: 'profiler.newProfiler', diff --git a/src/sql/parts/profiler/contrib/profilerActions.ts b/src/sql/parts/profiler/contrib/profilerActions.ts index c293f879f0..081ed58270 100644 --- a/src/sql/parts/profiler/contrib/profilerActions.ts +++ b/src/sql/parts/profiler/contrib/profilerActions.ts @@ -5,14 +5,13 @@ 'use strict'; import 'vs/css!sql/parts/profiler/media/profiler'; -import { IProfilerService, ProfilerFilter } from 'sql/parts/profiler/service/interfaces'; +import { IProfilerService } from 'sql/workbench/services/profiler/common/interfaces'; import { IProfilerController } from 'sql/parts/profiler/editor/controller/interfaces'; import { ProfilerInput } from 'sql/parts/profiler/editor/profilerInput'; -import { BaseActionContext } from 'sql/workbench/common/actions'; import { Task } from 'sql/platform/tasks/common/tasks'; -import { ConnectionProfile } from 'sql/parts/connection/common/connectionProfile'; -import { IConnectionManagementService, IConnectionCompletionOptions, ConnectionType } from 'sql/parts/connection/common/connectionManagement'; -import { IConnectionProfile } from 'sql/parts/connection/common/interfaces'; +import { ConnectionProfile } from 'sql/platform/connection/common/connectionProfile'; +import { IConnectionManagementService, IConnectionCompletionOptions } from 'sql/platform/connection/common/connectionManagement'; +import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; import { TPromise } from 'vs/base/common/winjs.base'; import { Action } from 'vs/base/common/actions'; diff --git a/src/sql/parts/profiler/dialog/profilerFilterDialog.ts b/src/sql/parts/profiler/dialog/profilerFilterDialog.ts index 57e62a37bc..4c1eb91922 100644 --- a/src/sql/parts/profiler/dialog/profilerFilterDialog.ts +++ b/src/sql/parts/profiler/dialog/profilerFilterDialog.ts @@ -18,7 +18,6 @@ import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry'; import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey'; import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService'; import { localize } from 'vs/nls'; -import { ProfilerFilter, ProfilerFilterClauseOperator, ProfilerFilterClause } from 'sql/parts/profiler/service/interfaces'; import { ProfilerInput } from 'sql/parts/profiler/editor/profilerInput'; import { InputBox } from 'sql/base/browser/ui/inputBox/inputBox'; import { SelectBox } from 'sql/base/browser/ui/selectBox/selectBox'; @@ -27,6 +26,7 @@ import { IContextViewService } from 'vs/platform/contextview/browser/contextView import { generateUuid } from 'vs/base/common/uuid'; import * as DOM from 'vs/base/browser/dom'; import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent'; +import { ProfilerFilter, ProfilerFilterClause, ProfilerFilterClauseOperator } from 'sql/workbench/services/profiler/common/interfaces'; const ClearText: string = localize('profilerFilterDialog.clear', 'Clear All'); diff --git a/src/sql/parts/profiler/editor/profilerEditor.ts b/src/sql/parts/profiler/editor/profilerEditor.ts index 5f99523f24..dbc75cbf1e 100644 --- a/src/sql/parts/profiler/editor/profilerEditor.ts +++ b/src/sql/parts/profiler/editor/profilerEditor.ts @@ -7,7 +7,7 @@ import { ProfilerInput } from './profilerInput'; import { TabbedPanel } from 'sql/base/browser/ui/panel/panel'; import { Table } from 'sql/base/browser/ui/table/table'; import { TableDataView } from 'sql/base/browser/ui/table/tableDataView'; -import { IProfilerService, IProfilerViewTemplate } from 'sql/parts/profiler/service/interfaces'; +import { IProfilerService, IProfilerViewTemplate } from 'sql/workbench/services/profiler/common/interfaces'; import { Taskbar } from 'sql/base/browser/ui/taskbar/taskbar'; import { attachTableStyler } from 'sql/common/theme/styler'; import { IProfilerStateChangedEvent } from './profilerState'; diff --git a/src/sql/parts/profiler/editor/profilerInput.ts b/src/sql/parts/profiler/editor/profilerInput.ts index 49143ee068..877d7af576 100644 --- a/src/sql/parts/profiler/editor/profilerInput.ts +++ b/src/sql/parts/profiler/editor/profilerInput.ts @@ -4,9 +4,9 @@ *--------------------------------------------------------------------------------------------*/ import { TableDataView } from 'sql/base/browser/ui/table/tableDataView'; -import { IProfilerSession, IProfilerService, ProfilerSessionID, IProfilerViewTemplate, ProfilerFilter } from 'sql/parts/profiler/service/interfaces'; +import { IProfilerSession, IProfilerService, ProfilerSessionID, IProfilerViewTemplate, ProfilerFilter } from 'sql/workbench/services/profiler/common/interfaces'; import { ProfilerState } from './profilerState'; -import { IConnectionProfile } from 'sql/parts/connection/common/interfaces'; +import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; import * as sqlops from 'sqlops'; import * as nls from 'vs/nls'; @@ -18,7 +18,7 @@ import { IInstantiationService } from 'vs/platform/instantiation/common/instanti import { INotificationService } from 'vs/platform/notification/common/notification'; import { Event, Emitter } from 'vs/base/common/event'; import { generateUuid } from 'vs/base/common/uuid'; -import { IDialogService, IConfirmation, IConfirmationResult } from 'vs/platform/dialogs/common/dialogs'; +import { IDialogService } from 'vs/platform/dialogs/common/dialogs'; import { escape } from 'sql/base/common/strings'; import * as types from 'vs/base/common/types'; import URI from 'vs/base/common/uri'; diff --git a/src/sql/parts/profiler/service/profilerFilter.ts b/src/sql/parts/profiler/service/profilerFilter.ts index ae514323de..ff821dd595 100644 --- a/src/sql/parts/profiler/service/profilerFilter.ts +++ b/src/sql/parts/profiler/service/profilerFilter.ts @@ -3,7 +3,8 @@ * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { ProfilerFilter, ProfilerFilterClause, ProfilerFilterClauseOperator } from 'sql/parts/profiler/service/interfaces'; +import { ProfilerFilterClause, ProfilerFilter, ProfilerFilterClauseOperator } from 'sql/workbench/services/profiler/common/interfaces'; + export function FilterData(filter: ProfilerFilter, data: any[]): any[] { if (!data || !filter) { diff --git a/src/sql/parts/profiler/service/profilerTestBackend.ts b/src/sql/parts/profiler/service/profilerTestBackend.ts deleted file mode 100644 index 534f5855b6..0000000000 --- a/src/sql/parts/profiler/service/profilerTestBackend.ts +++ /dev/null @@ -1,124 +0,0 @@ -/*--------------------------------------------------------------------------------------------- - * Copyright (c) Microsoft Corporation. All rights reserved. - * Licensed under the Source EULA. See License.txt in the project root for license information. - *--------------------------------------------------------------------------------------------*/ - -import { IProfilerService } from './interfaces'; - -import { TPromise } from 'vs/base/common/winjs.base'; -import * as pfs from 'vs/base/node/pfs'; -import * as path from 'path'; - -import * as sqlops from 'sqlops'; - -declare var __dirname; - -const columns = [ - 'EventClass', - 'TextData', - 'ApplicationName', - 'NTUserName', - 'LoginName', - 'CPU', - 'Reads', - 'Writes', - 'Duration', - 'ClientProcessID', - 'SPID', - 'StartTime', - 'EndTime', - 'BinaryData' -]; - -export class ProfilerTestBackend implements sqlops.ProfilerProvider { - public readonly providerId = 'MSSQL'; - private index = 0; - private timeOutMap = new Map(); - private testData: Array> = new Array>(); - - constructor( - @IProfilerService private _profilerService: IProfilerService) { } - - createSession(guid: string, createStatement: string, template: sqlops.ProfilerSessionTemplate): Thenable { - this.timeOutMap.set(guid, this.intervalFn(guid)); - return TPromise.as(true); - } - startSession(guid: string, sessionName: string): Thenable { - this.timeOutMap.set(guid, this.intervalFn(guid)); - return TPromise.as(true); - } - - registerOnSessionEventsAvailable(handler: (response: sqlops.ProfilerSessionEvents) => any) { - return; - } - - registerOnSessionStopped(handler: (response: sqlops.ProfilerSessionStoppedParams) => any) { - return; - } - - registerOnProfilerSessionCreated(handler: (response: sqlops.ProfilerSessionCreatedParams) => any) { - return; - } - - private intervalFn(guid: string): number { - return setTimeout(() => { - let data = this.testData[this.index++]; - let formattedData = { - EventClass: data[0].trim() - }; - - for (let i = 1; i < data.length; i++) { - formattedData[columns[i]] = data[i]; - } - - //this._profilerService.onMoreRows({ uri: guid, rowCount: 1, data: formattedData }); - - - if (this.index >= this.testData.length) { - this.index = 0; - } - this.timeOutMap.set(guid, this.intervalFn(guid)); - }, Math.floor(Math.random() * 1000) + 300); - } - - stopSession(guid: string): Thenable { - clearTimeout(this.timeOutMap.get(guid)); - this.index = 0; - return TPromise.as(true); - } - - pauseSession(guid: string): Thenable { - clearTimeout(this.timeOutMap.get(guid)); - return TPromise.as(true); - } - - getXEventSessions(guid: string): Thenable { - let retVal = ['']; - return TPromise.as(retVal); - } - - connectSession(): Thenable { - if (this.testData.length === 0) { - return new TPromise((resolve, reject) => { - pfs.readFile(path.join(__dirname, 'testData.tsv')).then(result => { - let tabsep = result.toString().split('\t'); - for (let i = 0; i < tabsep.length; i++) { - if (i % columns.length === 0) { - this.testData[i / columns.length] = new Array(); - } - this.testData[Math.floor(i / columns.length)][i % columns.length] = tabsep[i]; - } - resolve(true); - }); - }); - } else { - return TPromise.as(true); - } - } - - disconnectSession(guid: string): Thenable { - clearTimeout(this.timeOutMap.get(guid)); - this.index = 0; - return TPromise.as(true); - } -} diff --git a/src/sql/parts/profiler/service/testData.tsv b/src/sql/parts/profiler/service/testData.tsv deleted file mode 100644 index b00cc8bd49..0000000000 --- a/src/sql/parts/profiler/service/testData.tsv +++ /dev/null @@ -1,3320 +0,0 @@ -Audit Login -- network protocol: TCP/IP -set quoted_identifier on -set arithabort off -set numeric_roundabort off -set ansi_warnings on -set ansi_padding on -set ansi_nulls on -set concat_null_yields_null on -set cursor_close_on_commit off -set implicit_transactions off -set language us_english -set dateformat mdy -set datefirst 7 -set transaction isolation level read committed - carbon sa 2064905136 62 2017-08-04 12:28:56.547 -SQL:BatchStarting SELECT SERVERPROPERTY('EngineEdition'), SERVERPROPERTY('productversion'), SERVERPROPERTY ('productlevel'), SERVERPROPERTY ('edition'), SERVERPROPERTY ('MachineName'), (SELECT CASE WHEN EXISTS (SELECT TOP 1 1 from [sys].[all_columns] WITH (NOLOCK) WHERE name = N'xml_index_type' AND OBJECT_ID(N'sys.xml_indexes') = object_id) THEN 1 ELSE 0 END AS SXI_PRESENT) carbon sa 2064905136 62 2017-08-04 12:28:56.620 -SQL:BatchCompleted SELECT SERVERPROPERTY('EngineEdition'), SERVERPROPERTY('productversion'), SERVERPROPERTY ('productlevel'), SERVERPROPERTY ('edition'), SERVERPROPERTY ('MachineName'), (SELECT CASE WHEN EXISTS (SELECT TOP 1 1 from [sys].[all_columns] WITH (NOLOCK) WHERE name = N'xml_index_type' AND OBJECT_ID(N'sys.xml_indexes') = object_id) THEN 1 ELSE 0 END AS SXI_PRESENT) carbon sa 0 5 0 0 2064905136 62 2017-08-04 12:28:56.620 2017-08-04 12:28:56.620 -SQL:BatchStarting SELECT ISNULL(SESSIONPROPERTY ('ANSI_NULLS'), 0), ISNULL(SESSIONPROPERTY ('QUOTED_IDENTIFIER'), 1) carbon sa 2064905136 62 2017-08-04 12:28:56.663 -SQL:BatchCompleted SELECT ISNULL(SESSIONPROPERTY ('ANSI_NULLS'), 0), ISNULL(SESSIONPROPERTY ('QUOTED_IDENTIFIER'), 1) carbon sa 0 0 0 0 2064905136 62 2017-08-04 12:28:56.663 2017-08-04 12:28:56.663 -SQL:BatchStarting SELECT SERVERPROPERTY('EngineEdition'), SERVERPROPERTY('productversion'), SERVERPROPERTY ('productlevel'), SERVERPROPERTY ('edition'), SERVERPROPERTY ('MachineName'), (SELECT CASE WHEN EXISTS (SELECT TOP 1 1 from [sys].[all_columns] WITH (NOLOCK) WHERE name = N'xml_index_type' AND OBJECT_ID(N'sys.xml_indexes') = object_id) THEN 1 ELSE 0 END AS SXI_PRESENT) carbon sa 2064905136 62 2017-08-04 12:28:56.667 -SQL:BatchCompleted SELECT SERVERPROPERTY('EngineEdition'), SERVERPROPERTY('productversion'), SERVERPROPERTY ('productlevel'), SERVERPROPERTY ('edition'), SERVERPROPERTY ('MachineName'), (SELECT CASE WHEN EXISTS (SELECT TOP 1 1 from [sys].[all_columns] WITH (NOLOCK) WHERE name = N'xml_index_type' AND OBJECT_ID(N'sys.xml_indexes') = object_id) THEN 1 ELSE 0 END AS SXI_PRESENT) carbon sa 0 5 0 0 2064905136 62 2017-08-04 12:28:56.667 2017-08-04 12:28:56.667 -SQL:BatchStarting SELECT ISNULL(SESSIONPROPERTY ('ANSI_NULLS'), 0), ISNULL(SESSIONPROPERTY ('QUOTED_IDENTIFIER'), 1) carbon sa 2064905136 62 2017-08-04 12:28:56.667 -SQL:BatchCompleted SELECT ISNULL(SESSIONPROPERTY ('ANSI_NULLS'), 0), ISNULL(SESSIONPROPERTY ('QUOTED_IDENTIFIER'), 1) carbon sa 0 0 0 0 2064905136 62 2017-08-04 12:28:56.667 2017-08-04 12:28:56.667 -SQL:BatchStarting SELECT CONVERT(NVARCHAR(36), CONTEXT_INFO()) carbon sa 2064905136 62 2017-08-04 12:28:56.670 -SQL:BatchCompleted SELECT CONVERT(NVARCHAR(36), CONTEXT_INFO()) carbon sa 0 0 0 0 2064905136 62 2017-08-04 12:28:56.670 2017-08-04 12:28:56.670 -SQL:BatchStarting set LOCK_TIMEOUT 5000 carbon sa 2064905136 62 2017-08-04 12:28:56.677 -SQL:BatchCompleted set LOCK_TIMEOUT 5000 carbon sa 0 0 0 0 2064905136 62 2017-08-04 12:28:56.677 2017-08-04 12:28:56.677 -SQL:BatchStarting SET ANSI_NULLS, ANSI_PADDING, ANSI_WARNINGS, ARITHABORT, CONCAT_NULL_YIELDS_NULL, QUOTED_IDENTIFIER ON; -SET NUMERIC_ROUNDABORT OFF; carbon sa 2064905136 62 2017-08-04 12:28:56.680 -SQL:BatchCompleted SET ANSI_NULLS, ANSI_PADDING, ANSI_WARNINGS, ARITHABORT, CONCAT_NULL_YIELDS_NULL, QUOTED_IDENTIFIER ON; -SET NUMERIC_ROUNDABORT OFF; carbon sa 0 0 0 0 2064905136 62 2017-08-04 12:28:56.680 2017-08-04 12:28:56.680 -SQL:BatchStarting SELECT SERVERPROPERTY('EngineEdition'), SERVERPROPERTY('productversion'), SERVERPROPERTY ('productlevel'), SERVERPROPERTY ('edition'), SERVERPROPERTY ('MachineName'), (SELECT CASE WHEN EXISTS (SELECT TOP 1 1 from [sys].[all_columns] WITH (NOLOCK) WHERE name = N'xml_index_type' AND OBJECT_ID(N'sys.xml_indexes') = object_id) THEN 1 ELSE 0 END AS SXI_PRESENT) carbon sa 2064905136 62 2017-08-04 12:28:56.683 -SQL:BatchCompleted SELECT SERVERPROPERTY('EngineEdition'), SERVERPROPERTY('productversion'), SERVERPROPERTY ('productlevel'), SERVERPROPERTY ('edition'), SERVERPROPERTY ('MachineName'), (SELECT CASE WHEN EXISTS (SELECT TOP 1 1 from [sys].[all_columns] WITH (NOLOCK) WHERE name = N'xml_index_type' AND OBJECT_ID(N'sys.xml_indexes') = object_id) THEN 1 ELSE 0 END AS SXI_PRESENT) carbon sa 0 5 0 0 2064905136 62 2017-08-04 12:28:56.683 2017-08-04 12:28:56.683 -SQL:BatchStarting SELECT OSVersion = RIGHT(@@version, LEN(@@version)- 3 -charindex (' ON ', @@version)) carbon sa 2064905136 62 2017-08-04 12:28:56.687 -SQL:BatchCompleted SELECT OSVersion = RIGHT(@@version, LEN(@@version)- 3 -charindex (' ON ', @@version)) carbon sa 0 0 0 0 2064905136 62 2017-08-04 12:28:56.687 2017-08-04 12:28:56.687 -Audit Login -- network protocol: TCP/IP -set quoted_identifier on -set arithabort off -set numeric_roundabort off -set ansi_warnings on -set ansi_padding on -set ansi_nulls on -set concat_null_yields_null on -set cursor_close_on_commit off -set implicit_transactions off -set language us_english -set dateformat mdy -set datefirst 7 -set transaction isolation level read committed - carbon sa 2064905136 63 2017-08-04 12:28:56.763 -Audit Login -- network protocol: TCP/IP -set quoted_identifier on -set arithabort off -set numeric_roundabort off -set ansi_warnings on -set ansi_padding on -set ansi_nulls on -set concat_null_yields_null on -set cursor_close_on_commit off -set implicit_transactions off -set language us_english -set dateformat mdy -set datefirst 7 -set transaction isolation level read committed - carbon sa 2064905136 65 2017-08-04 12:28:56.837 -SQL:BatchStarting SELECT ISNULL(SESSIONPROPERTY ('ANSI_NULLS'), 0), ISNULL(SESSIONPROPERTY ('QUOTED_IDENTIFIER'), 1) carbon sa 2064905136 65 2017-08-04 12:28:56.837 -SQL:BatchCompleted SELECT ISNULL(SESSIONPROPERTY ('ANSI_NULLS'), 0), ISNULL(SESSIONPROPERTY ('QUOTED_IDENTIFIER'), 1) carbon sa 0 0 0 0 2064905136 65 2017-08-04 12:28:56.837 2017-08-04 12:28:56.837 -SQL:BatchStarting SELECT CONVERT(NVARCHAR(36), CONTEXT_INFO()) carbon sa 2064905136 65 2017-08-04 12:28:56.840 -SQL:BatchCompleted SELECT CONVERT(NVARCHAR(36), CONTEXT_INFO()) carbon sa 0 0 0 0 2064905136 65 2017-08-04 12:28:56.840 2017-08-04 12:28:56.840 -SQL:BatchStarting set LOCK_TIMEOUT 5000 carbon sa 2064905136 65 2017-08-04 12:28:56.840 -SQL:BatchCompleted set LOCK_TIMEOUT 5000 carbon sa 0 0 0 0 2064905136 65 2017-08-04 12:28:56.840 2017-08-04 12:28:56.840 -SQL:BatchStarting SET ANSI_NULLS, ANSI_PADDING, ANSI_WARNINGS, ARITHABORT, CONCAT_NULL_YIELDS_NULL, QUOTED_IDENTIFIER ON; -SET NUMERIC_ROUNDABORT OFF; carbon sa 2064905136 65 2017-08-04 12:28:56.840 -SQL:BatchCompleted SET ANSI_NULLS, ANSI_PADDING, ANSI_WARNINGS, ARITHABORT, CONCAT_NULL_YIELDS_NULL, QUOTED_IDENTIFIER ON; -SET NUMERIC_ROUNDABORT OFF; carbon sa 0 0 0 0 2064905136 65 2017-08-04 12:28:56.840 2017-08-04 12:28:56.840 -SQL:BatchStarting SELECT SERVERPROPERTY('EngineEdition'), SERVERPROPERTY('productversion'), SERVERPROPERTY ('productlevel'), SERVERPROPERTY ('edition'), SERVERPROPERTY ('MachineName'), (SELECT CASE WHEN EXISTS (SELECT TOP 1 1 from [sys].[all_columns] WITH (NOLOCK) WHERE name = N'xml_index_type' AND OBJECT_ID(N'sys.xml_indexes') = object_id) THEN 1 ELSE 0 END AS SXI_PRESENT) carbon sa 2064905136 65 2017-08-04 12:28:56.840 -SQL:BatchCompleted SELECT SERVERPROPERTY('EngineEdition'), SERVERPROPERTY('productversion'), SERVERPROPERTY ('productlevel'), SERVERPROPERTY ('edition'), SERVERPROPERTY ('MachineName'), (SELECT CASE WHEN EXISTS (SELECT TOP 1 1 from [sys].[all_columns] WITH (NOLOCK) WHERE name = N'xml_index_type' AND OBJECT_ID(N'sys.xml_indexes') = object_id) THEN 1 ELSE 0 END AS SXI_PRESENT) carbon sa 0 5 0 0 2064905136 65 2017-08-04 12:28:56.840 2017-08-04 12:28:56.840 -SQL:BatchStarting SELECT OSVersion = RIGHT(@@version, LEN(@@version)- 3 -charindex (' ON ', @@version)) carbon sa 2064905136 65 2017-08-04 12:28:56.843 -SQL:BatchCompleted SELECT OSVersion = RIGHT(@@version, LEN(@@version)- 3 -charindex (' ON ', @@version)) carbon sa 0 0 0 0 2064905136 65 2017-08-04 12:28:56.843 2017-08-04 12:28:56.843 -SQL:BatchStarting DECLARE @edition sysname; SET @edition = cast(SERVERPROPERTY(N'EDITION') as sysname); select case when @edition = N'SQL Azure' then 2 else 1 end as 'DatabaseEngineType'; -SELECT SERVERPROPERTY('EngineEdition') AS DatabaseEngineEdition -select N'Windows' as host_platform - carbon sa 2064905136 63 2017-08-04 12:28:57.193 -SQL:BatchCompleted DECLARE @edition sysname; SET @edition = cast(SERVERPROPERTY(N'EDITION') as sysname); select case when @edition = N'SQL Azure' then 2 else 1 end as 'DatabaseEngineType'; -SELECT SERVERPROPERTY('EngineEdition') AS DatabaseEngineEdition -select N'Windows' as host_platform - carbon sa 0 0 0 0 2064905136 63 2017-08-04 12:28:57.193 2017-08-04 12:28:57.193 -Audit Login -- network protocol: TCP/IP -set quoted_identifier on -set arithabort off -set numeric_roundabort off -set ansi_warnings on -set ansi_padding on -set ansi_nulls on -set concat_null_yields_null on -set cursor_close_on_commit off -set implicit_transactions off -set language us_english -set dateformat mdy -set datefirst 7 -set transaction isolation level read committed - Core .Net SqlClient Data Provider sa 2064905136 66 2017-08-04 12:28:57.300 -SQL:BatchStarting DECLARE @edition sysname; SET @edition = cast(SERVERPROPERTY(N'EDITION') as sysname); select case when @edition = N'SQL Azure' then 2 else 1 end as 'DatabaseEngineType'; -SELECT SERVERPROPERTY('EngineEdition') AS DatabaseEngineEdition -select N'Windows' as host_platform - Core .Net SqlClient Data Provider sa 2064905136 66 2017-08-04 12:28:57.300 -SQL:BatchCompleted DECLARE @edition sysname; SET @edition = cast(SERVERPROPERTY(N'EDITION') as sysname); select case when @edition = N'SQL Azure' then 2 else 1 end as 'DatabaseEngineType'; -SELECT SERVERPROPERTY('EngineEdition') AS DatabaseEngineEdition -select N'Windows' as host_platform - Core .Net SqlClient Data Provider sa 0 0 0 0 2064905136 66 2017-08-04 12:28:57.300 2017-08-04 12:28:57.300 -SQL:BatchStarting select SERVERPROPERTY(N'servername') carbon sa 2064905136 63 2017-08-04 12:28:57.313 -SQL:BatchCompleted select SERVERPROPERTY(N'servername') carbon sa 0 0 0 0 2064905136 63 2017-08-04 12:28:57.313 2017-08-04 12:28:57.313 -SQL:BatchStarting select SERVERPROPERTY(N'servername') Core .Net SqlClient Data Provider sa 2064905136 66 2017-08-04 12:28:57.330 -SQL:BatchCompleted select SERVERPROPERTY(N'servername') Core .Net SqlClient Data Provider sa 0 0 0 0 2064905136 66 2017-08-04 12:28:57.330 2017-08-04 12:28:57.330 -SQL:BatchStarting use [master]; -if (db_id() = 1) -begin --- contained auth is 0 when connected to master -select 0 -end -else -begin --- need dynamic sql so that we compile this query only when we know resource db is available -exec('select case when authenticating_database_id = 1 then 0 else 1 end from -sys.dm_exec_sessions where session_id = @@SPID') -end;use [master]; --resetting the context carbon sa 2064905136 63 2017-08-04 12:28:57.330 -SQL:BatchCompleted use [master]; -if (db_id() = 1) -begin --- contained auth is 0 when connected to master -select 0 -end -else -begin --- need dynamic sql so that we compile this query only when we know resource db is available -exec('select case when authenticating_database_id = 1 then 0 else 1 end from -sys.dm_exec_sessions where session_id = @@SPID') -end;use [master]; --resetting the context carbon sa 0 0 0 0 2064905136 63 2017-08-04 12:28:57.330 2017-08-04 12:28:57.330 -SQL:BatchStarting SELECT -CAST( - serverproperty(N'Servername') - AS sysname) AS [Name] carbon sa 2064905136 63 2017-08-04 12:28:57.437 -SQL:BatchCompleted SELECT -CAST( - serverproperty(N'Servername') - AS sysname) AS [Name] carbon sa 0 0 0 0 2064905136 63 2017-08-04 12:28:57.437 2017-08-04 12:28:57.437 -SQL:BatchStarting - declare @HkeyLocal nvarchar(18) - declare @ServicesRegPath nvarchar(34) - declare @SqlServiceRegPath sysname - declare @BrowserServiceRegPath sysname - declare @MSSqlServerRegPath nvarchar(31) - declare @InstanceNamesRegPath nvarchar(59) - declare @InstanceRegPath sysname - declare @SetupRegPath sysname - declare @NpRegPath sysname - declare @TcpRegPath sysname - declare @RegPathParams sysname - declare @FilestreamRegPath sysname - - select @HkeyLocal=N'HKEY_LOCAL_MACHINE' - - -- Instance-based paths - select @MSSqlServerRegPath=N'SOFTWARE\Microsoft\MSSQLServer' - select @InstanceRegPath=@MSSqlServerRegPath + N'\MSSQLServer' - select @FilestreamRegPath=@InstanceRegPath + N'\Filestream' - select @SetupRegPath=@MSSqlServerRegPath + N'\Setup' - select @RegPathParams=@InstanceRegPath+'\Parameters' - - -- Services - select @ServicesRegPath=N'SYSTEM\CurrentControlSet\Services' - select @SqlServiceRegPath=@ServicesRegPath + N'\MSSQLSERVER' - select @BrowserServiceRegPath=@ServicesRegPath + N'\SQLBrowser' - - -- InstanceId setting - select @InstanceNamesRegPath=N'SOFTWARE\Microsoft\Microsoft SQL Server\Instance Names\SQL' - - -- Network settings - select @NpRegPath=@InstanceRegPath + N'\SuperSocketNetLib\Np' - select @TcpRegPath=@InstanceRegPath + N'\SuperSocketNetLib\Tcp' - - - - declare @SmoAuditLevel int - exec master.dbo.xp_instance_regread @HkeyLocal, @InstanceRegPath, N'AuditLevel', @SmoAuditLevel OUTPUT - - - - declare @NumErrorLogs int - exec master.dbo.xp_instance_regread @HkeyLocal, @InstanceRegPath, N'NumErrorLogs', @NumErrorLogs OUTPUT - - - - declare @SmoLoginMode int - exec master.dbo.xp_instance_regread @HkeyLocal, @InstanceRegPath, N'LoginMode', @SmoLoginMode OUTPUT - - - - declare @SmoMailProfile nvarchar(512) - exec master.dbo.xp_instance_regread @HkeyLocal, @InstanceRegPath, N'MailAccountName', @SmoMailProfile OUTPUT - - - - declare @BackupDirectory nvarchar(512) - if 1=isnull(cast(SERVERPROPERTY('IsLocalDB') as bit), 0) - select @BackupDirectory=cast(SERVERPROPERTY('instancedefaultdatapath') as nvarchar(512)) - else - exec master.dbo.xp_instance_regread @HkeyLocal, @InstanceRegPath, N'BackupDirectory', @BackupDirectory OUTPUT - - - - declare @SmoPerfMonMode int - exec master.dbo.xp_instance_regread @HkeyLocal, @InstanceRegPath, N'Performance', @SmoPerfMonMode OUTPUT - - if @SmoPerfMonMode is null - begin - set @SmoPerfMonMode = 1000 - end - - - - declare @InstallSqlDataDir nvarchar(512) - exec master.dbo.xp_instance_regread @HkeyLocal, @SetupRegPath, N'SQLDataRoot', @InstallSqlDataDir OUTPUT - - - - declare @MasterPath nvarchar(512) - declare @LogPath nvarchar(512) - declare @ErrorLog nvarchar(512) - declare @ErrorLogPath nvarchar(512) - - select @MasterPath=substring(physical_name, 1, len(physical_name) - charindex('\', reverse(physical_name))) from master.sys.database_files where name=N'master' - select @LogPath=substring(physical_name, 1, len(physical_name) - charindex('\', reverse(physical_name))) from master.sys.database_files where name=N'mastlog' - select @ErrorLog=cast(SERVERPROPERTY(N'errorlogfilename') as nvarchar(512)) - select @ErrorLogPath=substring(@ErrorLog, 1, len(@ErrorLog) - charindex('\', reverse(@ErrorLog))) - - - - declare @SmoRoot nvarchar(512) - exec master.dbo.xp_instance_regread @HkeyLocal, @SetupRegPath, N'SQLPath', @SmoRoot OUTPUT - - - - declare @ServiceStartMode int - EXEC master.sys.xp_instance_regread @HkeyLocal, @SqlServiceRegPath, N'Start', @ServiceStartMode OUTPUT - - - - declare @ServiceAccount nvarchar(512) - EXEC master.sys.xp_instance_regread @HkeyLocal, @SqlServiceRegPath, N'ObjectName', @ServiceAccount OUTPUT - - - - declare @NamedPipesEnabled int - exec master.dbo.xp_instance_regread @HkeyLocal, @NpRegPath, N'Enabled', @NamedPipesEnabled OUTPUT - - - - declare @TcpEnabled int - EXEC master.sys.xp_instance_regread @HkeyLocal, @TcpRegPath, N'Enabled', @TcpEnabled OUTPUT - - - - declare @InstallSharedDirectory nvarchar(512) - EXEC master.sys.xp_instance_regread @HkeyLocal, @SetupRegPath, N'SQLPath', @InstallSharedDirectory OUTPUT - - - - declare @SqlGroup nvarchar(512) - exec master.dbo.xp_instance_regread @HkeyLocal, @SetupRegPath, N'SQLGroup', @SqlGroup OUTPUT - - - - declare @FilestreamLevel int - exec master.dbo.xp_instance_regread @HkeyLocal, @FilestreamRegPath, N'EnableLevel', @FilestreamLevel OUTPUT - - - - declare @FilestreamShareName nvarchar(512) - exec master.dbo.xp_instance_regread @HkeyLocal, @FilestreamRegPath, N'ShareName', @FilestreamShareName OUTPUT - - - - declare @cluster_name nvarchar(128) - declare @quorum_type tinyint - declare @quorum_state tinyint - BEGIN TRY - SELECT @cluster_name = cluster_name, - @quorum_type = quorum_type, - @quorum_state = quorum_state - FROM sys.dm_hadr_cluster - END TRY - BEGIN CATCH - --Querying this DMV using a contained auth connection throws error 15562 (Module is untrusted) - --because of lack of trustworthiness by the server. This is expected so we just leave the - --values as default - IF(ERROR_NUMBER() NOT IN (297,300, 15562)) - BEGIN - THROW - END - END CATCH - - -SELECT -@SmoAuditLevel AS [AuditLevel], -ISNULL(@NumErrorLogs, -1) AS [NumberOfLogFiles], -(case when @SmoLoginMode < 3 then @SmoLoginMode else 9 end) AS [LoginMode], -ISNULL(@SmoMailProfile,N'') AS [MailProfile], -@BackupDirectory AS [BackupDirectory], -@SmoPerfMonMode AS [PerfMonMode], -ISNULL(@InstallSqlDataDir,N'') AS [InstallDataDirectory], -CAST(@@SERVICENAME AS sysname) AS [ServiceName], -@ErrorLogPath AS [ErrorLogPath], -@SmoRoot AS [RootDirectory], -CAST(case when 'a' <> 'A' then 1 else 0 end AS bit) AS [IsCaseSensitive], -@@MAX_PRECISION AS [MaxPrecision], -CAST(FULLTEXTSERVICEPROPERTY('IsFullTextInstalled') AS bit) AS [IsFullTextInstalled], -SERVERPROPERTY(N'ProductVersion') AS [VersionString], -CAST(SERVERPROPERTY(N'Edition') AS sysname) AS [Edition], -CAST(SERVERPROPERTY(N'ProductLevel') AS sysname) AS [ProductLevel], -CAST(SERVERPROPERTY('IsSingleUser') AS bit) AS [IsSingleUser], -CAST(SERVERPROPERTY('EngineEdition') AS int) AS [EngineEdition], -convert(sysname, serverproperty(N'collation')) AS [Collation], -CAST(SERVERPROPERTY('IsClustered') AS bit) AS [IsClustered], -CAST(SERVERPROPERTY(N'MachineName') AS sysname) AS [NetName], -@LogPath AS [MasterDBLogPath], -@MasterPath AS [MasterDBPath], -SERVERPROPERTY('instancedefaultdatapath') AS [DefaultFile], -SERVERPROPERTY('instancedefaultlogpath') AS [DefaultLog], -SERVERPROPERTY(N'ResourceVersion') AS [ResourceVersionString], -SERVERPROPERTY(N'ResourceLastUpdateDateTime') AS [ResourceLastUpdateDateTime], -SERVERPROPERTY(N'CollationID') AS [CollationID], -SERVERPROPERTY(N'ComparisonStyle') AS [ComparisonStyle], -SERVERPROPERTY(N'SqlCharSet') AS [SqlCharSet], -SERVERPROPERTY(N'SqlCharSetName') AS [SqlCharSetName], -SERVERPROPERTY(N'SqlSortOrder') AS [SqlSortOrder], -SERVERPROPERTY(N'SqlSortOrderName') AS [SqlSortOrderName], -SERVERPROPERTY(N'ComputerNamePhysicalNetBIOS') AS [ComputerNamePhysicalNetBIOS], -SERVERPROPERTY(N'BuildClrVersion') AS [BuildClrVersionString], -@ServiceStartMode AS [ServiceStartMode], -ISNULL(@ServiceAccount,N'') AS [ServiceAccount], -CAST(@NamedPipesEnabled AS bit) AS [NamedPipesEnabled], -CAST(@TcpEnabled AS bit) AS [TcpEnabled], -ISNULL(@InstallSharedDirectory,N'') AS [InstallSharedDirectory], -ISNULL(suser_sname(sid_binary(ISNULL(@SqlGroup,N''))),N'') AS [SqlDomainGroup], -case when 1=msdb.dbo.fn_syspolicy_is_automation_enabled() and exists (select * from msdb.dbo.syspolicy_system_health_state where target_query_expression_with_id like 'Server%' ) then 1 else 0 end AS [PolicyHealthState], -@FilestreamLevel AS [FilestreamLevel], -ISNULL(@FilestreamShareName,N'') AS [FilestreamShareName], --1 AS [TapeLoadWaitTime], -CAST(SERVERPROPERTY(N'IsHadrEnabled') AS bit) AS [IsHadrEnabled], -SERVERPROPERTY(N'HADRManagerStatus') AS [HadrManagerStatus], -ISNULL(@cluster_name, '') AS [ClusterName], -ISNULL(@quorum_type, 4) AS [ClusterQuorumType], -ISNULL(@quorum_state, 3) AS [ClusterQuorumState], -SUSER_SID(@ServiceAccount, 0) AS [ServiceAccountSid], -CAST(SERVERPROPERTY('IsPolyBaseInstalled') AS bit) AS [IsPolyBaseInstalled], -N'Windows' AS [HostPlatform], -CAST( - serverproperty(N'Servername') - AS sysname) AS [Name], -CAST( - ISNULL(serverproperty(N'instancename'),N'') - AS sysname) AS [InstanceName], -CAST(0x0001 AS int) AS [Status], -N'\' AS [PathSeparator], -0 AS [IsContainedAuthentication], -CAST(null AS int) AS [ServerType] - - drop table #SVer - - Core .Net SqlClient Data Provider sa 2064905136 66 2017-08-04 12:28:57.437 -SQL:BatchCompleted - declare @HkeyLocal nvarchar(18) - declare @ServicesRegPath nvarchar(34) - declare @SqlServiceRegPath sysname - declare @BrowserServiceRegPath sysname - declare @MSSqlServerRegPath nvarchar(31) - declare @InstanceNamesRegPath nvarchar(59) - declare @InstanceRegPath sysname - declare @SetupRegPath sysname - declare @NpRegPath sysname - declare @TcpRegPath sysname - declare @RegPathParams sysname - declare @FilestreamRegPath sysname - - select @HkeyLocal=N'HKEY_LOCAL_MACHINE' - - -- Instance-based paths - select @MSSqlServerRegPath=N'SOFTWARE\Microsoft\MSSQLServer' - select @InstanceRegPath=@MSSqlServerRegPath + N'\MSSQLServer' - select @FilestreamRegPath=@InstanceRegPath + N'\Filestream' - select @SetupRegPath=@MSSqlServerRegPath + N'\Setup' - select @RegPathParams=@InstanceRegPath+'\Parameters' - - -- Services - select @ServicesRegPath=N'SYSTEM\CurrentControlSet\Services' - select @SqlServiceRegPath=@ServicesRegPath + N'\MSSQLSERVER' - select @BrowserServiceRegPath=@ServicesRegPath + N'\SQLBrowser' - - -- InstanceId setting - select @InstanceNamesRegPath=N'SOFTWARE\Microsoft\Microsoft SQL Server\Instance Names\SQL' - - -- Network settings - select @NpRegPath=@InstanceRegPath + N'\SuperSocketNetLib\Np' - select @TcpRegPath=@InstanceRegPath + N'\SuperSocketNetLib\Tcp' - - - - declare @SmoAuditLevel int - exec master.dbo.xp_instance_regread @HkeyLocal, @InstanceRegPath, N'AuditLevel', @SmoAuditLevel OUTPUT - - - - declare @NumErrorLogs int - exec master.dbo.xp_instance_regread @HkeyLocal, @InstanceRegPath, N'NumErrorLogs', @NumErrorLogs OUTPUT - - - - declare @SmoLoginMode int - exec master.dbo.xp_instance_regread @HkeyLocal, @InstanceRegPath, N'LoginMode', @SmoLoginMode OUTPUT - - - - declare @SmoMailProfile nvarchar(512) - exec master.dbo.xp_instance_regread @HkeyLocal, @InstanceRegPath, N'MailAccountName', @SmoMailProfile OUTPUT - - - - declare @BackupDirectory nvarchar(512) - if 1=isnull(cast(SERVERPROPERTY('IsLocalDB') as bit), 0) - select @BackupDirectory=cast(SERVERPROPERTY('instancedefaultdatapath') as nvarchar(512)) - else - exec master.dbo.xp_instance_regread @HkeyLocal, @InstanceRegPath, N'BackupDirectory', @BackupDirectory OUTPUT - - - - declare @SmoPerfMonMode int - exec master.dbo.xp_instance_regread @HkeyLocal, @InstanceRegPath, N'Performance', @SmoPerfMonMode OUTPUT - - if @SmoPerfMonMode is null - begin - set @SmoPerfMonMode = 1000 - end - - - - declare @InstallSqlDataDir nvarchar(512) - exec master.dbo.xp_instance_regread @HkeyLocal, @SetupRegPath, N'SQLDataRoot', @InstallSqlDataDir OUTPUT - - - - declare @MasterPath nvarchar(512) - declare @LogPath nvarchar(512) - declare @ErrorLog nvarchar(512) - declare @ErrorLogPath nvarchar(512) - - select @MasterPath=substring(physical_name, 1, len(physical_name) - charindex('\', reverse(physical_name))) from master.sys.database_files where name=N'master' - select @LogPath=substring(physical_name, 1, len(physical_name) - charindex('\', reverse(physical_name))) from master.sys.database_files where name=N'mastlog' - select @ErrorLog=cast(SERVERPROPERTY(N'errorlogfilename') as nvarchar(512)) - select @ErrorLogPath=substring(@ErrorLog, 1, len(@ErrorLog) - charindex('\', reverse(@ErrorLog))) - - - - declare @SmoRoot nvarchar(512) - exec master.dbo.xp_instance_regread @HkeyLocal, @SetupRegPath, N'SQLPath', @SmoRoot OUTPUT - - - - declare @ServiceStartMode int - EXEC master.sys.xp_instance_regread @HkeyLocal, @SqlServiceRegPath, N'Start', @ServiceStartMode OUTPUT - - - - declare @ServiceAccount nvarchar(512) - EXEC master.sys.xp_instance_regread @HkeyLocal, @SqlServiceRegPath, N'ObjectName', @ServiceAccount OUTPUT - - - - declare @NamedPipesEnabled int - exec master.dbo.xp_instance_regread @HkeyLocal, @NpRegPath, N'Enabled', @NamedPipesEnabled OUTPUT - - - - declare @TcpEnabled int - EXEC master.sys.xp_instance_regread @HkeyLocal, @TcpRegPath, N'Enabled', @TcpEnabled OUTPUT - - - - declare @InstallSharedDirectory nvarchar(512) - EXEC master.sys.xp_instance_regread @HkeyLocal, @SetupRegPath, N'SQLPath', @InstallSharedDirectory OUTPUT - - - - declare @SqlGroup nvarchar(512) - exec master.dbo.xp_instance_regread @HkeyLocal, @SetupRegPath, N'SQLGroup', @SqlGroup OUTPUT - - - - declare @FilestreamLevel int - exec master.dbo.xp_instance_regread @HkeyLocal, @FilestreamRegPath, N'EnableLevel', @FilestreamLevel OUTPUT - - - - declare @FilestreamShareName nvarchar(512) - exec master.dbo.xp_instance_regread @HkeyLocal, @FilestreamRegPath, N'ShareName', @FilestreamShareName OUTPUT - - - - declare @cluster_name nvarchar(128) - declare @quorum_type tinyint - declare @quorum_state tinyint - BEGIN TRY - SELECT @cluster_name = cluster_name, - @quorum_type = quorum_type, - @quorum_state = quorum_state - FROM sys.dm_hadr_cluster - END TRY - BEGIN CATCH - --Querying this DMV using a contained auth connection throws error 15562 (Module is untrusted) - --because of lack of trustworthiness by the server. This is expected so we just leave the - --values as default - IF(ERROR_NUMBER() NOT IN (297,300, 15562)) - BEGIN - THROW - END - END CATCH - - -SELECT -@SmoAuditLevel AS [AuditLevel], -ISNULL(@NumErrorLogs, -1) AS [NumberOfLogFiles], -(case when @SmoLoginMode < 3 then @SmoLoginMode else 9 end) AS [LoginMode], -ISNULL(@SmoMailProfile,N'') AS [MailProfile], -@BackupDirectory AS [BackupDirectory], -@SmoPerfMonMode AS [PerfMonMode], -ISNULL(@InstallSqlDataDir,N'') AS [InstallDataDirectory], -CAST(@@SERVICENAME AS sysname) AS [ServiceName], -@ErrorLogPath AS [ErrorLogPath], -@SmoRoot AS [RootDirectory], -CAST(case when 'a' <> 'A' then 1 else 0 end AS bit) AS [IsCaseSensitive], -@@MAX_PRECISION AS [MaxPrecision], -CAST(FULLTEXTSERVICEPROPERTY('IsFullTextInstalled') AS bit) AS [IsFullTextInstalled], -SERVERPROPERTY(N'ProductVersion') AS [VersionString], -CAST(SERVERPROPERTY(N'Edition') AS sysname) AS [Edition], -CAST(SERVERPROPERTY(N'ProductLevel') AS sysname) AS [ProductLevel], -CAST(SERVERPROPERTY('IsSingleUser') AS bit) AS [IsSingleUser], -CAST(SERVERPROPERTY('EngineEdition') AS int) AS [EngineEdition], -convert(sysname, serverproperty(N'collation')) AS [Collation], -CAST(SERVERPROPERTY('IsClustered') AS bit) AS [IsClustered], -CAST(SERVERPROPERTY(N'MachineName') AS sysname) AS [NetName], -@LogPath AS [MasterDBLogPath], -@MasterPath AS [MasterDBPath], -SERVERPROPERTY('instancedefaultdatapath') AS [DefaultFile], -SERVERPROPERTY('instancedefaultlogpath') AS [DefaultLog], -SERVERPROPERTY(N'ResourceVersion') AS [ResourceVersionString], -SERVERPROPERTY(N'ResourceLastUpdateDateTime') AS [ResourceLastUpdateDateTime], -SERVERPROPERTY(N'CollationID') AS [CollationID], -SERVERPROPERTY(N'ComparisonStyle') AS [ComparisonStyle], -SERVERPROPERTY(N'SqlCharSet') AS [SqlCharSet], -SERVERPROPERTY(N'SqlCharSetName') AS [SqlCharSetName], -SERVERPROPERTY(N'SqlSortOrder') AS [SqlSortOrder], -SERVERPROPERTY(N'SqlSortOrderName') AS [SqlSortOrderName], -SERVERPROPERTY(N'ComputerNamePhysicalNetBIOS') AS [ComputerNamePhysicalNetBIOS], -SERVERPROPERTY(N'BuildClrVersion') AS [BuildClrVersionString], -@ServiceStartMode AS [ServiceStartMode], -ISNULL(@ServiceAccount,N'') AS [ServiceAccount], -CAST(@NamedPipesEnabled AS bit) AS [NamedPipesEnabled], -CAST(@TcpEnabled AS bit) AS [TcpEnabled], -ISNULL(@InstallSharedDirectory,N'') AS [InstallSharedDirectory], -ISNULL(suser_sname(sid_binary(ISNULL(@SqlGroup,N''))),N'') AS [SqlDomainGroup], -case when 1=msdb.dbo.fn_syspolicy_is_automation_enabled() and exists (select * from msdb.dbo.syspolicy_system_health_state where target_query_expression_with_id like 'Server%' ) then 1 else 0 end AS [PolicyHealthState], -@FilestreamLevel AS [FilestreamLevel], -ISNULL(@FilestreamShareName,N'') AS [FilestreamShareName], --1 AS [TapeLoadWaitTime], -CAST(SERVERPROPERTY(N'IsHadrEnabled') AS bit) AS [IsHadrEnabled], -SERVERPROPERTY(N'HADRManagerStatus') AS [HadrManagerStatus], -ISNULL(@cluster_name, '') AS [ClusterName], -ISNULL(@quorum_type, 4) AS [ClusterQuorumType], -ISNULL(@quorum_state, 3) AS [ClusterQuorumState], -SUSER_SID(@ServiceAccount, 0) AS [ServiceAccountSid], -CAST(SERVERPROPERTY('IsPolyBaseInstalled') AS bit) AS [IsPolyBaseInstalled], -N'Windows' AS [HostPlatform], -CAST( - serverproperty(N'Servername') - AS sysname) AS [Name], -CAST( - ISNULL(serverproperty(N'instancename'),N'') - AS sysname) AS [InstanceName], -CAST(0x0001 AS int) AS [Status], -N'\' AS [PathSeparator], -0 AS [IsContainedAuthentication], -CAST(null AS int) AS [ServerType] - - drop table #SVer - - Core .Net SqlClient Data Provider sa 16 9 0 16 2064905136 66 2017-08-04 12:28:57.437 2017-08-04 12:28:57.453 -SQL:BatchStarting - declare @MasterPath nvarchar(512) - declare @LogPath nvarchar(512) - declare @ErrorLog nvarchar(512) - declare @ErrorLogPath nvarchar(512) - - select @MasterPath=substring(physical_name, 1, len(physical_name) - charindex('\', reverse(physical_name))) from master.sys.database_files where name=N'master' - select @LogPath=substring(physical_name, 1, len(physical_name) - charindex('\', reverse(physical_name))) from master.sys.database_files where name=N'mastlog' - select @ErrorLog=cast(SERVERPROPERTY(N'errorlogfilename') as nvarchar(512)) - select @ErrorLogPath=substring(@ErrorLog, 1, len(@ErrorLog) - charindex('\', reverse(@ErrorLog))) - - - - declare @SmoRoot nvarchar(512) - exec master.dbo.xp_instance_regread N'HKEY_LOCAL_MACHINE', N'SOFTWARE\Microsoft\MSSQLServer\Setup', N'SQLPath', @SmoRoot OUTPUT - - - -SELECT -CAST(case when 'a' <> 'A' then 1 else 0 end AS bit) AS [IsCaseSensitive], -@@MAX_PRECISION AS [MaxPrecision], -@ErrorLogPath AS [ErrorLogPath], -@SmoRoot AS [RootDirectory], -N'Windows' AS [HostPlatform], -N'\' AS [PathSeparator], -CAST(FULLTEXTSERVICEPROPERTY('IsFullTextInstalled') AS bit) AS [IsFullTextInstalled], -@LogPath AS [MasterDBLogPath], -@MasterPath AS [MasterDBPath], -SERVERPROPERTY(N'ProductVersion') AS [VersionString], -CAST(SERVERPROPERTY(N'Edition') AS sysname) AS [Edition], -CAST(SERVERPROPERTY(N'ProductLevel') AS sysname) AS [ProductLevel], -CAST(SERVERPROPERTY('IsSingleUser') AS bit) AS [IsSingleUser], -CAST(SERVERPROPERTY('EngineEdition') AS int) AS [EngineEdition], -convert(sysname, serverproperty(N'collation')) AS [Collation], -CAST(SERVERPROPERTY(N'MachineName') AS sysname) AS [NetName], -CAST(SERVERPROPERTY('IsClustered') AS bit) AS [IsClustered], -SERVERPROPERTY(N'ResourceVersion') AS [ResourceVersionString], -SERVERPROPERTY(N'ResourceLastUpdateDateTime') AS [ResourceLastUpdateDateTime], -SERVERPROPERTY(N'CollationID') AS [CollationID], -SERVERPROPERTY(N'ComparisonStyle') AS [ComparisonStyle], -SERVERPROPERTY(N'SqlCharSet') AS [SqlCharSet], -SERVERPROPERTY(N'SqlCharSetName') AS [SqlCharSetName], -SERVERPROPERTY(N'SqlSortOrder') AS [SqlSortOrder], -SERVERPROPERTY(N'SqlSortOrderName') AS [SqlSortOrderName], -SERVERPROPERTY(N'BuildClrVersion') AS [BuildClrVersionString], -SERVERPROPERTY(N'ComputerNamePhysicalNetBIOS') AS [ComputerNamePhysicalNetBIOS], -CAST(SERVERPROPERTY('IsPolyBaseInstalled') AS bit) AS [IsPolyBaseInstalled] carbon sa 2064905136 63 2017-08-04 12:28:57.480 -SQL:BatchCompleted - declare @MasterPath nvarchar(512) - declare @LogPath nvarchar(512) - declare @ErrorLog nvarchar(512) - declare @ErrorLogPath nvarchar(512) - - select @MasterPath=substring(physical_name, 1, len(physical_name) - charindex('\', reverse(physical_name))) from master.sys.database_files where name=N'master' - select @LogPath=substring(physical_name, 1, len(physical_name) - charindex('\', reverse(physical_name))) from master.sys.database_files where name=N'mastlog' - select @ErrorLog=cast(SERVERPROPERTY(N'errorlogfilename') as nvarchar(512)) - select @ErrorLogPath=substring(@ErrorLog, 1, len(@ErrorLog) - charindex('\', reverse(@ErrorLog))) - - - - declare @SmoRoot nvarchar(512) - exec master.dbo.xp_instance_regread N'HKEY_LOCAL_MACHINE', N'SOFTWARE\Microsoft\MSSQLServer\Setup', N'SQLPath', @SmoRoot OUTPUT - - - -SELECT -CAST(case when 'a' <> 'A' then 1 else 0 end AS bit) AS [IsCaseSensitive], -@@MAX_PRECISION AS [MaxPrecision], -@ErrorLogPath AS [ErrorLogPath], -@SmoRoot AS [RootDirectory], -N'Windows' AS [HostPlatform], -N'\' AS [PathSeparator], -CAST(FULLTEXTSERVICEPROPERTY('IsFullTextInstalled') AS bit) AS [IsFullTextInstalled], -@LogPath AS [MasterDBLogPath], -@MasterPath AS [MasterDBPath], -SERVERPROPERTY(N'ProductVersion') AS [VersionString], -CAST(SERVERPROPERTY(N'Edition') AS sysname) AS [Edition], -CAST(SERVERPROPERTY(N'ProductLevel') AS sysname) AS [ProductLevel], -CAST(SERVERPROPERTY('IsSingleUser') AS bit) AS [IsSingleUser], -CAST(SERVERPROPERTY('EngineEdition') AS int) AS [EngineEdition], -convert(sysname, serverproperty(N'collation')) AS [Collation], -CAST(SERVERPROPERTY(N'MachineName') AS sysname) AS [NetName], -CAST(SERVERPROPERTY('IsClustered') AS bit) AS [IsClustered], -SERVERPROPERTY(N'ResourceVersion') AS [ResourceVersionString], -SERVERPROPERTY(N'ResourceLastUpdateDateTime') AS [ResourceLastUpdateDateTime], -SERVERPROPERTY(N'CollationID') AS [CollationID], -SERVERPROPERTY(N'ComparisonStyle') AS [ComparisonStyle], -SERVERPROPERTY(N'SqlCharSet') AS [SqlCharSet], -SERVERPROPERTY(N'SqlCharSetName') AS [SqlCharSetName], -SERVERPROPERTY(N'SqlSortOrder') AS [SqlSortOrder], -SERVERPROPERTY(N'SqlSortOrderName') AS [SqlSortOrderName], -SERVERPROPERTY(N'BuildClrVersion') AS [BuildClrVersionString], -SERVERPROPERTY(N'ComputerNamePhysicalNetBIOS') AS [ComputerNamePhysicalNetBIOS], -CAST(SERVERPROPERTY('IsPolyBaseInstalled') AS bit) AS [IsPolyBaseInstalled] carbon sa 0 5 0 2 2064905136 63 2017-08-04 12:28:57.480 2017-08-04 12:28:57.483 -SQL:BatchStarting SELECT -cfg.name AS [Name], -cfg.configuration_id AS [Number], -cfg.minimum AS [Minimum], -cfg.maximum AS [Maximum], -cfg.is_dynamic AS [Dynamic], -cfg.is_advanced AS [Advanced], -cfg.value AS [ConfigValue], -cfg.value_in_use AS [RunValue], -cfg.description AS [Description] -FROM -sys.configurations AS cfg Core .Net SqlClient Data Provider sa 2064905136 66 2017-08-04 12:28:57.533 -SQL:BatchCompleted SELECT -cfg.name AS [Name], -cfg.configuration_id AS [Number], -cfg.minimum AS [Minimum], -cfg.maximum AS [Maximum], -cfg.is_dynamic AS [Dynamic], -cfg.is_advanced AS [Advanced], -cfg.value AS [ConfigValue], -cfg.value_in_use AS [RunValue], -cfg.description AS [Description] -FROM -sys.configurations AS cfg Core .Net SqlClient Data Provider sa 0 4 0 0 2064905136 66 2017-08-04 12:28:57.533 2017-08-04 12:28:57.533 -RPC:Completed exec sp_executesql N'SELECT -dtb.name AS [Name] -FROM -master.sys.databases AS dtb -WHERE -(dtb.name=@_msparam_0)',N'@_msparam_0 nvarchar(4000)',@_msparam_0=N'master' Core .Net SqlClient Data Provider sa 0 8 0 0 2064905136 66 2017-08-04 12:28:57.580 2017-08-04 12:28:57.580 0X00000000040000001A00730070005F006500780065006300750074006500730071006C00D400000082001800E7206E0076006100720063006800610072002800380037002900AE000000530045004C004500430054000A006400740062002E006E0061006D00650020004100530020005B004E0061006D0065005D000A00460052004F004D000A006D00610073007400650072002E007300790073002E0064006100740061006200610073006500730020004100530020006400740062000A00570048004500520045000A0028006400740062002E006E0061006D0065003D0040005F006D00730070006100720061006D005F00300029005A00000082001800 -RPC:Completed exec sp_executesql N'SELECT -dtb.collation_name AS [Collation], -dtb.name AS [DatabaseName2] -FROM -master.sys.databases AS dtb -WHERE -(dtb.name=@_msparam_0)',N'@_msparam_0 nvarchar(4000)',@_msparam_0=N'master' carbon sa 0 8 0 0 2064905136 63 2017-08-04 12:28:57.580 2017-08-04 12:28:57.580 0X00000000040000001A00730070005F006500780065006300750074006500730071006C002E01000082001A00E7206E0076006100720063006800610072002800310033003100290006010000530045004C004500430054000A006400740062002E0063006F006C006C006100740069006F006E005F006E0061006D00650020004100530020005B0043006F006C006C006100740069006F006E005D002C000A006400740062002E006E0061006D00650020004100530020005B00440061007400610062006100730065004E0061006D00650032005D000A00460052004F004D000A006D00610073007400650072002E007300790073002E006400610074006100 -SQL:BatchStarting SELECT -dtb.name AS [Name], -dtb.database_id AS [ID], -CAST(case when dtb.name in ('master','model','msdb','tempdb') then 1 else dtb.is_distributor end AS bit) AS [IsSystemObject], -dtb.collation_name AS [Collation], -CAST(has_dbaccess(dtb.name) AS bit) AS [IsAccessible], -dtb.name AS [DatabaseName2] -FROM -master.sys.databases AS dtb -ORDER BY -[Name] ASC carbon sa 2064905136 63 2017-08-04 12:28:57.600 -RPC:Completed exec sp_executesql N'SELECT -dtb.compatibility_level AS [CompatibilityLevel], -dtb.name AS [DatabaseName2] -FROM -master.sys.databases AS dtb -WHERE -(dtb.name=@_msparam_0)',N'@_msparam_0 nvarchar(4000)',@_msparam_0=N'master' Core .Net SqlClient Data Provider sa 0 10 0 0 2064905136 66 2017-08-04 12:28:57.610 2017-08-04 12:28:57.610 0X00000000040000001A00730070005F006500780065006300750074006500730071006C004A01000082001A00E7206E0076006100720063006800610072002800310034003500290022010000530045004C004500430054000A006400740062002E0063006F006D007000610074006900620069006C006900740079005F006C006500760065006C0020004100530020005B0043006F006D007000610074006900620069006C006900740079004C006500760065006C005D002C000A006400740062002E006E0061006D00650020004100530020005B00440061007400610062006100730065004E0061006D00650032005D000A00460052004F004D000A006D00 -SQL:BatchCompleted SELECT -dtb.name AS [Name], -dtb.database_id AS [ID], -CAST(case when dtb.name in ('master','model','msdb','tempdb') then 1 else dtb.is_distributor end AS bit) AS [IsSystemObject], -dtb.collation_name AS [Collation], -CAST(has_dbaccess(dtb.name) AS bit) AS [IsAccessible], -dtb.name AS [DatabaseName2] -FROM -master.sys.databases AS dtb -ORDER BY -[Name] ASC carbon sa 16 174 0 12 2064905136 63 2017-08-04 12:28:57.600 2017-08-04 12:28:57.613 -RPC:Completed exec sp_executesql N'SELECT -ISNULL((case dmi.mirroring_redo_queue_type when N''UNLIMITED'' then 0 else dmi.mirroring_redo_queue end),0) AS [MirroringRedoQueueMaxSize], -ISNULL(dmi.mirroring_connection_timeout,0) AS [MirroringTimeout], -ISNULL(dmi.mirroring_partner_name,'''') AS [MirroringPartner], -ISNULL(dmi.mirroring_partner_instance,'''') AS [MirroringPartnerInstance], -ISNULL(dmi.mirroring_role,0) AS [MirroringRole], -ISNULL(dmi.mirroring_safety_level + 1, 0) AS [MirroringSafetyLevel], -ISNULL(dmi.mirroring_state + 1, 0) AS [MirroringStatus], -ISNULL(dmi.mirroring_witness_name,'''') AS [MirroringWitness], -ISNULL(dmi.mirroring_witness_state + 1, 0) AS [MirroringWitnessStatus], -CAST(case when dmi.mirroring_partner_name is null then 0 else 1 end AS bit) AS [IsMirroringEnabled], -ISNULL(dmi.mirroring_guid,''00000000-0000-0000-0000-0000000000000000'') AS [MirroringID], -ISNULL(dmi.mirroring_role_sequence,0) AS [MirroringRoleSequence], -ISNULL(dmi.mirroring_safety_sequence,0) AS [MirroringSafetySequence], -ISNULL(dmi.mirroring_failover_lsn,0) AS [MirroringFailoverLogSequenceNumber], -dtb.is_ansi_null_default_on AS [AnsiNullDefault], -dtb.is_ansi_nulls_on AS [AnsiNullsEnabled], -dtb.is_ansi_padding_on AS [AnsiPaddingEnabled], -dtb.is_ansi_warnings_on AS [AnsiWarningsEnabled], -dtb.is_arithabort_on AS [ArithmeticAbortEnabled], -dtb.is_auto_shrink_on AS [AutoShrink], -dtb.is_cursor_close_on_commit_on AS [CloseCursorsOnCommitEnabled], -dtb.is_concat_null_yields_null_on AS [ConcatenateNullYieldsNull], -dtb.is_numeric_roundabort_on AS [NumericRoundAbortEnabled], -dtb.is_quoted_identifier_on AS [QuotedIdentifiersEnabled], -dtb.is_read_only AS [ReadOnly], -dtb.is_recursive_triggers_on AS [RecursiveTriggersEnabled], -dtb.user_access AS [UserAccess], -dtb.is_db_chaining_on AS [DatabaseOwnershipChaining], -dtb.is_auto_update_stats_async_on AS [AutoUpdateStatisticsAsync], -dtb.is_date_correlation_on AS [DateCorrelationOptimization], -dtb.is_trustworthy_on AS [Trustworthy], -dtb.name AS [Name], -dtb.database_id AS [ID], -dtb.create_date AS [CreateDate], -dtb.is_auto_create_stats_on AS [AutoCreateStatisticsEnabled], -dtb.is_auto_update_stats_on AS [AutoUpdateStatisticsEnabled], -dtb.is_parameterization_forced AS [IsParameterizationForced], -dtb.is_read_committed_snapshot_on AS [IsReadCommittedSnapshotOn], -CAST(isnull(dtb.source_database_id, 0) AS bit) AS [IsDatabaseSnapshot], -ISNULL(DB_NAME(dtb.source_database_id), N'''') AS [DatabaseSnapshotBaseName], -dtb.is_fulltext_enabled AS [IsFullTextEnabled], -dtb.service_broker_guid AS [ServiceBrokerGuid], -dtb.snapshot_isolation_state AS [SnapshotIsolationState], -(dtb.is_published*1+dtb.is_subscribed*2+dtb.is_merge_published*4) AS [ReplicationOptions], -dtb.is_local_cursor_default AS [LocalCursorsDefault], -dtb.page_verify_option AS [PageVerify], -dtb.recovery_model AS [RecoveryModel], -dtb.is_auto_close_on AS [AutoClose], -dtb.is_broker_enabled AS [BrokerEnabled], -ISNULL(suser_sname(dtb.owner_sid),'''') AS [Owner], -ISNULL(dtb.log_reuse_wait,0) AS [LogReuseWaitStatus], -drs.recovery_fork_guid AS [RecoveryForkGuid], -drs.database_guid AS [DatabaseGuid], -CAST((case when drs.last_log_backup_lsn is not null then 1 else 0 end) AS bit) AS [HasFullBackup], -CAST(case when dtb.name in (''master'',''model'',''msdb'',''tempdb'') then 1 else dtb.is_distributor end AS bit) AS [IsSystemObject], -CAST(case when ctb.database_id is null then 0 else 1 end AS bit) AS [ChangeTrackingEnabled], -CAST(ISNULL(ctb.is_auto_cleanup_on,0) AS bit) AS [ChangeTrackingAutoCleanUp], -ISNULL(ctb.retention_period,0) AS [ChangeTrackingRetentionPeriod], -CAST(ISNULL(ctb.retention_period_units,0) AS tinyint) AS [ChangeTrackingRetentionPeriodUnits], -dtb.containment AS [ContainmentType], -dtb.default_language_lcid AS [DefaultLanguageLcid], -dtb.default_language_name AS [DefaultLanguageName], -dtb.default_fulltext_language_lcid AS [DefaultFullTextLanguageLcid], -ISNULL(dtb.default_fulltext_language_name,N'''') AS [DefaultFullTextLanguageName], -CAST(dtb.is_nested_triggers_on AS bit) AS [NestedTriggersEnabled], -CAST(dtb.is_transform_noise_words_on AS bit) AS [TransformNoiseWords], -dtb.two_digit_year_cutoff AS [TwoDigitYearCutoff], -dtb.target_recovery_time_in_seconds AS [TargetRecoveryTime], -dtb.delayed_durability AS [DelayedDurability], -dtb.is_auto_create_stats_incremental_on AS [AutoCreateIncrementalStatisticsEnabled], - - case - when dtb.collation_name is null then 0x200 - else 0 - end | - case - when 1 = dtb.is_in_standby then 0x40 - else 0 - end | - case dtb.state - when 1 then 0x2 - when 2 then 0x8 - when 3 then 0x4 - when 4 then 0x10 - when 5 then 0x100 - when 6 then 0x20 - else 1 - end - AS [Status], -CAST(( case LOWER(convert( nvarchar(128), DATABASEPROPERTYEX(dtb.name, ''Updateability''))) when ''read_write'' then 1 else 0 end) AS bit) AS [IsUpdateable], -CAST(dtb.is_encrypted AS bit) AS [EncryptionEnabled], -CAST(dtb.is_honor_broker_priority_on AS bit) AS [HonorBrokerPriority], -CAST( - case - when SERVERPROPERTY(''EngineEdition'') = 6 then cast(1 as bit) - else cast(0 as bit) - end - AS bit) AS [IsSqlDw], -CAST(has_dbaccess(dtb.name) AS bit) AS [IsAccessible], -ISNULL(fsopt.directory_name , N'''') AS [FilestreamDirectoryName], -ISNULL(fsopt.non_transacted_access , 0) AS [FilestreamNonTransactedAccess], -CAST(dtb.is_remote_data_archive_enabled AS bit) AS [RemoteDataArchiveEnabled], -NULL AS [RemoteDataArchiveEndpoint], -NULL AS [RemoteDataArchiveLinkedServer], -NULL AS [RemoteDatabaseName], -0 AS [RemoteDataArchiveUseFederatedServiceAccount], -NULL AS [RemoteDataArchiveCredential], -0 AS [MaxDop], -NULL AS [MaxDopForSecondary], -0 AS [LegacyCardinalityEstimation], -2 AS [LegacyCardinalityEstimationForSecondary], -0 AS [ParameterSniffing], -2 AS [ParameterSniffingForSecondary], -0 AS [QueryOptimizerHotfixes], -2 AS [QueryOptimizerHotfixesForSecondary], -dtb.name AS [DatabaseName2], -dtb.containment AS [ContainmentType2], -dtb.name AS [DatabaseName5], -dtb.name AS [DatabaseName6] -FROM -master.sys.databases AS dtb -LEFT OUTER JOIN sys.database_mirroring AS dmi ON dmi.database_id = dtb.database_id -LEFT OUTER JOIN sys.database_recovery_status AS drs ON drs.database_id = dtb.database_id -LEFT OUTER JOIN sys.change_tracking_databases AS ctb ON ctb.database_id = dtb.database_id -LEFT OUTER JOIN sys.database_filestream_options AS fsopt ON fsopt.database_id = dtb.database_id -WHERE -(dtb.name=@_msparam_0)',N'@_msparam_0 nvarchar(4000)',@_msparam_0=N'master' Core .Net SqlClient Data Provider sa 0 47 0 0 2064905136 66 2017-08-04 12:28:57.677 2017-08-04 12:28:57.677 0X00000000040000001A00730070005F006500780065006300750074006500730071006C002E32000082000A0063206E00740065007800740016320000530045004C004500430054000A00490053004E0055004C004C00280028006300610073006500200064006D0069002E006D006900720072006F00720069006E0067005F007200650064006F005F00710075006500750065005F00740079007000650020007700680065006E0020004E00270055004E004C0049004D004900540045004400270020007400680065006E0020003000200065006C0073006500200064006D0069002E006D006900720072006F00720069006E0067005F007200650064006F00 -SQL:BatchStarting select -case - when cfg.configuration_id = 124 -- configuration id for default language - then (select lcid from sys.syslanguages as sl where sl.langid = cfg.value_in_use) -- getting default language LCID from default language langid - else cfg.value_in_use -end as value, -case - when cfg.configuration_id = 124 -- configuration id for default language - then (select name collate catalog_default from sys.syslanguages as sl where sl.langid = cfg.value_in_use) -- getting default language name from default language langid - when cfg.configuration_id = 1126 -- configuration id for default fulltext language - then ISNULL((select name collate catalog_default from sys.fulltext_languages as fl where fl.lcid = cfg.value_in_use), N'') -- getting default fulltext language name from default fulltext language lcid - else null -end as name, -cfg.configuration_id as configuration_id -from sys.configurations as cfg -where cfg.configuration_id in (115, 124, 1126, 1127, 1555) -order by cfg.configuration_id asc Core .Net SqlClient Data Provider sa 2064905136 66 2017-08-04 12:28:57.693 -SQL:BatchCompleted select -case - when cfg.configuration_id = 124 -- configuration id for default language - then (select lcid from sys.syslanguages as sl where sl.langid = cfg.value_in_use) -- getting default language LCID from default language langid - else cfg.value_in_use -end as value, -case - when cfg.configuration_id = 124 -- configuration id for default language - then (select name collate catalog_default from sys.syslanguages as sl where sl.langid = cfg.value_in_use) -- getting default language name from default language langid - when cfg.configuration_id = 1126 -- configuration id for default fulltext language - then ISNULL((select name collate catalog_default from sys.fulltext_languages as fl where fl.lcid = cfg.value_in_use), N'') -- getting default fulltext language name from default fulltext language lcid - else null -end as name, -cfg.configuration_id as configuration_id -from sys.configurations as cfg -where cfg.configuration_id in (115, 124, 1126, 1127, 1555) -order by cfg.configuration_id asc Core .Net SqlClient Data Provider sa 0 0 0 0 2064905136 66 2017-08-04 12:28:57.693 2017-08-04 12:28:57.693 -SQL:BatchStarting SELECT CASE WHEN has_dbaccess(N'master') = 1 THEN 'true' ELSE 'false' END Core .Net SqlClient Data Provider sa 2064905136 66 2017-08-04 12:28:57.700 -SQL:BatchCompleted SELECT CASE WHEN has_dbaccess(N'master') = 1 THEN 'true' ELSE 'false' END Core .Net SqlClient Data Provider sa 0 0 0 0 2064905136 66 2017-08-04 12:28:57.700 2017-08-04 12:28:57.700 -RPC:Completed exec sp_executesql N'SELECT COLLATIONPROPERTY((select collation_name from sys.databases where name = ISNULL(@dbname, db_name())), ''LCID''), COLLATIONPROPERTY((select collation_name from sys.databases where name = ISNULL(@dbname, db_name())), ''ComparisonStyle'')',N'@dbname nvarchar(6)',@dbname=N'master' Core .Net SqlClient Data Provider sa 0 22 0 0 2064905136 66 2017-08-04 12:28:57.713 2017-08-04 12:28:57.713 0X00000000040000001A00730070005F006500780065006300750074006500730071006C000402000082001A00E7206E00760061007200630068006100720028003200330038002900DC010000530045004C00450043005400200043004F004C004C004100540049004F004E00500052004F005000450052005400590028002800730065006C00650063007400200063006F006C006C006100740069006F006E005F006E0061006D0065002000660072006F006D0020007300790073002E0064006100740061006200610073006500730020007700680065007200650020006E0061006D00650020003D002000490053004E0055004C004C002800400064006200 -Audit Login -- network protocol: TCP/IP -set quoted_identifier on -set arithabort off -set numeric_roundabort off -set ansi_warnings on -set ansi_padding on -set ansi_nulls on -set concat_null_yields_null on -set cursor_close_on_commit off -set implicit_transactions off -set language us_english -set dateformat mdy -set datefirst 7 -set transaction isolation level read committed - Core .Net SqlClient Data Provider sa 2064905136 67 2017-08-04 12:28:57.723 -SQL:BatchStarting SELECT -eds.location AS [RemoteDataArchiveEndpoint], -eds.name AS [RemoteDataArchiveLinkedServer], -rdad.remote_database_name AS [RemoteDatabaseName], -rdad.federated_service_account AS [RemoteDataArchiveUseFederatedServiceAccount], -case when rdad.federated_service_account = 1 then null else cred.name end AS [RemoteDataArchiveCredential] -FROM -sys.remote_data_archive_databases rdad -INNER JOIN sys.external_data_sources eds ON rdad.data_source_id = eds.data_source_id -LEFT OUTER JOIN sys.database_scoped_credentials cred ON eds.credential_id = cred.credential_id Core .Net SqlClient Data Provider sa 2064905136 67 2017-08-04 12:28:57.723 -SQL:BatchCompleted SELECT -eds.location AS [RemoteDataArchiveEndpoint], -eds.name AS [RemoteDataArchiveLinkedServer], -rdad.remote_database_name AS [RemoteDatabaseName], -rdad.federated_service_account AS [RemoteDataArchiveUseFederatedServiceAccount], -case when rdad.federated_service_account = 1 then null else cred.name end AS [RemoteDataArchiveCredential] -FROM -sys.remote_data_archive_databases rdad -INNER JOIN sys.external_data_sources eds ON rdad.data_source_id = eds.data_source_id -LEFT OUTER JOIN sys.database_scoped_credentials cred ON eds.credential_id = cred.credential_id Core .Net SqlClient Data Provider sa 0 2 0 0 2064905136 67 2017-08-04 12:28:57.723 2017-08-04 12:28:57.723 -Audit Logout Core .Net SqlClient Data Provider sa 0 2 0 7 2064905136 67 2017-08-04 12:28:57.723 2017-08-04 12:28:57.730 -SQL:BatchStarting SELECT CASE WHEN has_dbaccess(N'master') = 1 THEN 'true' ELSE 'false' END Core .Net SqlClient Data Provider sa 2064905136 66 2017-08-04 12:28:57.740 -SQL:BatchCompleted SELECT CASE WHEN has_dbaccess(N'master') = 1 THEN 'true' ELSE 'false' END Core .Net SqlClient Data Provider sa 0 0 0 0 2064905136 66 2017-08-04 12:28:57.740 2017-08-04 12:28:57.740 -Audit Login -- network protocol: TCP/IP -set quoted_identifier on -set arithabort off -set numeric_roundabort off -set ansi_warnings on -set ansi_padding on -set ansi_nulls on -set concat_null_yields_null on -set cursor_close_on_commit off -set implicit_transactions off -set language us_english -set dateformat mdy -set datefirst 7 -set transaction isolation level read committed - Core .Net SqlClient Data Provider sa 2064905136 67 2017-08-04 12:28:57.760 -SQL:BatchStarting SELECT -(select value from sys.database_scoped_configurations as dsc where dsc.name = 'MAXDOP') AS [MaxDop], -(select value_for_secondary from sys.database_scoped_configurations as dsc where dsc.name = 'MAXDOP') AS [MaxDopForSecondary], -(select value from sys.database_scoped_configurations as dsc where dsc.name = 'LEGACY_CARDINALITY_ESTIMATION') AS [LegacyCardinalityEstimation], -(select ISNULL(value_for_secondary, 2) from sys.database_scoped_configurations as dsc where dsc.name = 'LEGACY_CARDINALITY_ESTIMATION') AS [LegacyCardinalityEstimationForSecondary], -(select value from sys.database_scoped_configurations as dsc where dsc.name = 'PARAMETER_SNIFFING') AS [ParameterSniffing], -(select ISNULL(value_for_secondary, 2) from sys.database_scoped_configurations as dsc where dsc.name = 'PARAMETER_SNIFFING') AS [ParameterSniffingForSecondary], -(select value from sys.database_scoped_configurations as dsc where dsc.name = 'QUERY_OPTIMIZER_HOTFIXES') AS [QueryOptimizerHotfixes], -(select ISNULL(value_for_secondary, 2) from sys.database_scoped_configurations as dsc where dsc.name = 'QUERY_OPTIMIZER_HOTFIXES') AS [QueryOptimizerHotfixesForSecondary] Core .Net SqlClient Data Provider sa 2064905136 67 2017-08-04 12:28:57.760 -SQL:BatchCompleted SELECT -(select value from sys.database_scoped_configurations as dsc where dsc.name = 'MAXDOP') AS [MaxDop], -(select value_for_secondary from sys.database_scoped_configurations as dsc where dsc.name = 'MAXDOP') AS [MaxDopForSecondary], -(select value from sys.database_scoped_configurations as dsc where dsc.name = 'LEGACY_CARDINALITY_ESTIMATION') AS [LegacyCardinalityEstimation], -(select ISNULL(value_for_secondary, 2) from sys.database_scoped_configurations as dsc where dsc.name = 'LEGACY_CARDINALITY_ESTIMATION') AS [LegacyCardinalityEstimationForSecondary], -(select value from sys.database_scoped_configurations as dsc where dsc.name = 'PARAMETER_SNIFFING') AS [ParameterSniffing], -(select ISNULL(value_for_secondary, 2) from sys.database_scoped_configurations as dsc where dsc.name = 'PARAMETER_SNIFFING') AS [ParameterSniffingForSecondary], -(select value from sys.database_scoped_configurations as dsc where dsc.name = 'QUERY_OPTIMIZER_HOTFIXES') AS [QueryOptimizerHotfixes], -(select ISNULL(value_for_secondary, 2) from sys.database_scoped_configurations as dsc where dsc.name = 'QUERY_OPTIMIZER_HOTFIXES') AS [QueryOptimizerHotfixesForSecondary] Core .Net SqlClient Data Provider sa 0 44 0 0 2064905136 67 2017-08-04 12:28:57.760 2017-08-04 12:28:57.760 -Audit Logout Core .Net SqlClient Data Provider sa 0 44 0 3 2064905136 67 2017-08-04 12:28:57.760 2017-08-04 12:28:57.763 -SQL:BatchStarting SELECT -(@@microsoftversion / 0x1000000) & 0xff AS [VersionMajor] Core .Net SqlClient Data Provider sa 2064905136 66 2017-08-04 12:28:57.770 -SQL:BatchCompleted SELECT -(@@microsoftversion / 0x1000000) & 0xff AS [VersionMajor] Core .Net SqlClient Data Provider sa 0 0 0 0 2064905136 66 2017-08-04 12:28:57.770 2017-08-04 12:28:57.770 -SQL:BatchStarting select is_srvrolemember('sysadmin') * 1 +is_srvrolemember('serveradmin') * 2 +is_srvrolemember('setupadmin') * 4 +is_srvrolemember('securityadmin') * 8 +is_srvrolemember('processadmin') * 16 +is_srvrolemember('dbcreator') * 32 +is_srvrolemember('diskadmin') * 64+ is_srvrolemember('bulkadmin') * 128 Core .Net SqlClient Data Provider sa 2064905136 66 2017-08-04 12:28:57.770 -SQL:BatchCompleted select is_srvrolemember('sysadmin') * 1 +is_srvrolemember('serveradmin') * 2 +is_srvrolemember('setupadmin') * 4 +is_srvrolemember('securityadmin') * 8 +is_srvrolemember('processadmin') * 16 +is_srvrolemember('dbcreator') * 32 +is_srvrolemember('diskadmin') * 64+ is_srvrolemember('bulkadmin') * 128 Core .Net SqlClient Data Provider sa 0 0 0 0 2064905136 66 2017-08-04 12:28:57.770 2017-08-04 12:28:57.770 -SQL:BatchStarting USE [master] Core .Net SqlClient Data Provider sa 2064905136 66 2017-08-04 12:28:57.777 -SQL:BatchCompleted USE [master] Core .Net SqlClient Data Provider sa 0 0 0 0 2064905136 66 2017-08-04 12:28:57.777 2017-08-04 12:28:57.777 -SQL:BatchStarting select suser_sname((select sid from sys.database_principals where name = N'dbo')); Core .Net SqlClient Data Provider sa 2064905136 66 2017-08-04 12:28:57.777 -SQL:BatchCompleted select suser_sname((select sid from sys.database_principals where name = N'dbo')); Core .Net SqlClient Data Provider sa 0 6 0 0 2064905136 66 2017-08-04 12:28:57.777 2017-08-04 12:28:57.777 -RPC:Completed exec sp_executesql N' - create table #tempbackup (database_name nvarchar(128), [type] char(1), backup_finish_date datetime) - insert into #tempbackup select database_name, [type], max(backup_finish_date) from msdb..backupset where [type] = ''D'' or [type] = ''L'' or [type]=''I'' group by database_name, [type] - - - -SELECT -(select backup_finish_date from #tempbackup where type = @_msparam_0 and db_id(database_name) = dtb.database_id) AS [LastBackupDate] -FROM -master.sys.databases AS dtb -WHERE -(dtb.name=@_msparam_1) - - drop table #tempbackup - -',N'@_msparam_0 nvarchar(4000),@_msparam_1 nvarchar(4000)',@_msparam_0=N'D',@_msparam_1=N'master' Core .Net SqlClient Data Provider sa 15 221 0 5 2064905136 66 2017-08-04 12:28:57.790 2017-08-04 12:28:57.797 0X00000000050000001A00730070005F006500780065006300750074006500730071006C006C04000082001A00E7206E00760061007200630068006100720028003500340036002900440400000A002000200020002000200020002000200063007200650061007400650020007400610062006C00650020002300740065006D0070006200610063006B007500700020002800640061007400610062006100730065005F006E0061006D00650020006E007600610072006300680061007200280031003200380029002C0020005B0074007900700065005D00200063006800610072002800310029002C0020006200610063006B00750070005F00660069006E00 -RPC:Completed exec sp_executesql N' - create table #tempbackup (database_name nvarchar(128), [type] char(1), backup_finish_date datetime) - insert into #tempbackup select database_name, [type], max(backup_finish_date) from msdb..backupset where [type] = ''D'' or [type] = ''L'' or [type]=''I'' group by database_name, [type] - - - -SELECT -(select backup_finish_date from #tempbackup where type = @_msparam_0 and db_id(database_name) = dtb.database_id) AS [LastLogBackupDate] -FROM -master.sys.databases AS dtb -WHERE -(dtb.name=@_msparam_1) - - drop table #tempbackup - -',N'@_msparam_0 nvarchar(4000),@_msparam_1 nvarchar(4000)',@_msparam_0=N'L',@_msparam_1=N'master' Core .Net SqlClient Data Provider sa 0 200 1 3 2064905136 66 2017-08-04 12:28:57.797 2017-08-04 12:28:57.800 0X00000000050000001A00730070005F006500780065006300750074006500730071006C007204000082001A00E7206E007600610072006300680061007200280035003400390029004A0400000A002000200020002000200020002000200063007200650061007400650020007400610062006C00650020002300740065006D0070006200610063006B007500700020002800640061007400610062006100730065005F006E0061006D00650020006E007600610072006300680061007200280031003200380029002C0020005B0074007900700065005D00200063006800610072002800310029002C0020006200610063006B00750070005F00660069006E00 -RPC:Completed exec sp_executesql N'SELECT -dtb.collation_name AS [Collation], -dtb.name AS [DatabaseName2] -FROM -master.sys.databases AS dtb -WHERE -(dtb.name=@_msparam_0)',N'@_msparam_0 nvarchar(4000)',@_msparam_0=N'master' Core .Net SqlClient Data Provider sa 0 8 0 0 2064905136 66 2017-08-04 12:28:57.803 2017-08-04 12:28:57.803 0X00000000040000001A00730070005F006500780065006300750074006500730071006C002E01000082001A00E7206E0076006100720063006800610072002800310033003100290006010000530045004C004500430054000A006400740062002E0063006F006C006C006100740069006F006E005F006E0061006D00650020004100530020005B0043006F006C006C006100740069006F006E005D002C000A006400740062002E006E0061006D00650020004100530020005B00440061007400610062006100730065004E0061006D00650032005D000A00460052004F004D000A006D00610073007400650072002E007300790073002E006400610074006100 -SQL:BatchStarting - declare @MasterPath nvarchar(512) - declare @LogPath nvarchar(512) - declare @ErrorLog nvarchar(512) - declare @ErrorLogPath nvarchar(512) - - select @MasterPath=substring(physical_name, 1, len(physical_name) - charindex('\', reverse(physical_name))) from master.sys.database_files where name=N'master' - select @LogPath=substring(physical_name, 1, len(physical_name) - charindex('\', reverse(physical_name))) from master.sys.database_files where name=N'mastlog' - select @ErrorLog=cast(SERVERPROPERTY(N'errorlogfilename') as nvarchar(512)) - select @ErrorLogPath=substring(@ErrorLog, 1, len(@ErrorLog) - charindex('\', reverse(@ErrorLog))) - - - - declare @SmoRoot nvarchar(512) - exec master.dbo.xp_instance_regread N'HKEY_LOCAL_MACHINE', N'SOFTWARE\Microsoft\MSSQLServer\Setup', N'SQLPath', @SmoRoot OUTPUT - - - -SELECT -CAST(case when 'a' <> 'A' then 1 else 0 end AS bit) AS [IsCaseSensitive], -@@MAX_PRECISION AS [MaxPrecision], -@ErrorLogPath AS [ErrorLogPath], -@SmoRoot AS [RootDirectory], -N'Windows' AS [HostPlatform], -N'\' AS [PathSeparator], -CAST(FULLTEXTSERVICEPROPERTY('IsFullTextInstalled') AS bit) AS [IsFullTextInstalled], -@LogPath AS [MasterDBLogPath], -@MasterPath AS [MasterDBPath], -SERVERPROPERTY(N'ProductVersion') AS [VersionString], -CAST(SERVERPROPERTY(N'Edition') AS sysname) AS [Edition], -CAST(SERVERPROPERTY(N'ProductLevel') AS sysname) AS [ProductLevel], -CAST(SERVERPROPERTY('IsSingleUser') AS bit) AS [IsSingleUser], -CAST(SERVERPROPERTY('EngineEdition') AS int) AS [EngineEdition], -convert(sysname, serverproperty(N'collation')) AS [Collation], -CAST(SERVERPROPERTY(N'MachineName') AS sysname) AS [NetName], -CAST(SERVERPROPERTY('IsClustered') AS bit) AS [IsClustered], -SERVERPROPERTY(N'ResourceVersion') AS [ResourceVersionString], -SERVERPROPERTY(N'ResourceLastUpdateDateTime') AS [ResourceLastUpdateDateTime], -SERVERPROPERTY(N'CollationID') AS [CollationID], -SERVERPROPERTY(N'ComparisonStyle') AS [ComparisonStyle], -SERVERPROPERTY(N'SqlCharSet') AS [SqlCharSet], -SERVERPROPERTY(N'SqlCharSetName') AS [SqlCharSetName], -SERVERPROPERTY(N'SqlSortOrder') AS [SqlSortOrder], -SERVERPROPERTY(N'SqlSortOrderName') AS [SqlSortOrderName], -SERVERPROPERTY(N'BuildClrVersion') AS [BuildClrVersionString], -SERVERPROPERTY(N'ComputerNamePhysicalNetBIOS') AS [ComputerNamePhysicalNetBIOS], -CAST(SERVERPROPERTY('IsPolyBaseInstalled') AS bit) AS [IsPolyBaseInstalled] Core .Net SqlClient Data Provider sa 2064905136 66 2017-08-04 12:28:57.817 -SQL:BatchCompleted - declare @MasterPath nvarchar(512) - declare @LogPath nvarchar(512) - declare @ErrorLog nvarchar(512) - declare @ErrorLogPath nvarchar(512) - - select @MasterPath=substring(physical_name, 1, len(physical_name) - charindex('\', reverse(physical_name))) from master.sys.database_files where name=N'master' - select @LogPath=substring(physical_name, 1, len(physical_name) - charindex('\', reverse(physical_name))) from master.sys.database_files where name=N'mastlog' - select @ErrorLog=cast(SERVERPROPERTY(N'errorlogfilename') as nvarchar(512)) - select @ErrorLogPath=substring(@ErrorLog, 1, len(@ErrorLog) - charindex('\', reverse(@ErrorLog))) - - - - declare @SmoRoot nvarchar(512) - exec master.dbo.xp_instance_regread N'HKEY_LOCAL_MACHINE', N'SOFTWARE\Microsoft\MSSQLServer\Setup', N'SQLPath', @SmoRoot OUTPUT - - - -SELECT -CAST(case when 'a' <> 'A' then 1 else 0 end AS bit) AS [IsCaseSensitive], -@@MAX_PRECISION AS [MaxPrecision], -@ErrorLogPath AS [ErrorLogPath], -@SmoRoot AS [RootDirectory], -N'Windows' AS [HostPlatform], -N'\' AS [PathSeparator], -CAST(FULLTEXTSERVICEPROPERTY('IsFullTextInstalled') AS bit) AS [IsFullTextInstalled], -@LogPath AS [MasterDBLogPath], -@MasterPath AS [MasterDBPath], -SERVERPROPERTY(N'ProductVersion') AS [VersionString], -CAST(SERVERPROPERTY(N'Edition') AS sysname) AS [Edition], -CAST(SERVERPROPERTY(N'ProductLevel') AS sysname) AS [ProductLevel], -CAST(SERVERPROPERTY('IsSingleUser') AS bit) AS [IsSingleUser], -CAST(SERVERPROPERTY('EngineEdition') AS int) AS [EngineEdition], -convert(sysname, serverproperty(N'collation')) AS [Collation], -CAST(SERVERPROPERTY(N'MachineName') AS sysname) AS [NetName], -CAST(SERVERPROPERTY('IsClustered') AS bit) AS [IsClustered], -SERVERPROPERTY(N'ResourceVersion') AS [ResourceVersionString], -SERVERPROPERTY(N'ResourceLastUpdateDateTime') AS [ResourceLastUpdateDateTime], -SERVERPROPERTY(N'CollationID') AS [CollationID], -SERVERPROPERTY(N'ComparisonStyle') AS [ComparisonStyle], -SERVERPROPERTY(N'SqlCharSet') AS [SqlCharSet], -SERVERPROPERTY(N'SqlCharSetName') AS [SqlCharSetName], -SERVERPROPERTY(N'SqlSortOrder') AS [SqlSortOrder], -SERVERPROPERTY(N'SqlSortOrderName') AS [SqlSortOrderName], -SERVERPROPERTY(N'BuildClrVersion') AS [BuildClrVersionString], -SERVERPROPERTY(N'ComputerNamePhysicalNetBIOS') AS [ComputerNamePhysicalNetBIOS], -CAST(SERVERPROPERTY('IsPolyBaseInstalled') AS bit) AS [IsPolyBaseInstalled] Core .Net SqlClient Data Provider sa 0 5 0 1 2064905136 66 2017-08-04 12:28:57.817 2017-08-04 12:28:57.817 -RPC:Completed exec sp_executesql N' - create table #tmp_sp_db_vardecimal_storage_format (dbname sysname null, vardecimal_enabled varchar(3) null) - if exists (select o.object_id from sys.system_objects o where o.name=N''sp_db_vardecimal_storage_format'') - begin - insert into #tmp_sp_db_vardecimal_storage_format exec sys.sp_db_vardecimal_storage_format - end - - - -SELECT - - case - when vardec.vardecimal_enabled = ''ON'' then cast(1 as bit) - else cast(0 as bit) - end - AS [IsVarDecimalStorageFormatEnabled] -FROM -master.sys.databases AS dtb -LEFT OUTER JOIN #tmp_sp_db_vardecimal_storage_format as vardec ON dtb.database_id = db_id(vardec.dbname) -WHERE -(dtb.name=@_msparam_0) - - drop table #tmp_sp_db_vardecimal_storage_format - -',N'@_msparam_0 nvarchar(4000)',@_msparam_0=N'master' Core .Net SqlClient Data Provider sa 16 469 1 6 2064905136 66 2017-08-04 12:28:57.820 2017-08-04 12:28:57.827 0X00000000040000001A00730070005F006500780065006300750074006500730071006C002406000082001A00E7206E00760061007200630068006100720028003700360036002900FC0500000A002000200020002000200020002000200063007200650061007400650020007400610062006C0065002000230074006D0070005F00730070005F00640062005F0076006100720064006500630069006D0061006C005F00730074006F0072006100670065005F0066006F0072006D006100740020002800640062006E0061006D00650020007300790073006E0061006D00650020006E0075006C006C002C00200076006100720064006500630069006D006100 -SQL:BatchStarting use [master] Core .Net SqlClient Data Provider sa 2064905136 66 2017-08-04 12:28:57.867 -SQL:BatchCompleted use [master] Core .Net SqlClient Data Provider sa 0 0 0 0 2064905136 66 2017-08-04 12:28:57.867 2017-08-04 12:28:57.867 -RPC:Completed exec sp_executesql N'SELECT -sp.name AS [Name] -FROM -sys.database_scoped_configurations AS sp -WHERE -(sp.name=@_msparam_0)',N'@_msparam_0 nvarchar(4000)',@_msparam_0=N'MAXDOP' Core .Net SqlClient Data Provider sa 0 8 0 0 2064905136 66 2017-08-04 12:28:57.867 2017-08-04 12:28:57.867 0X00000000040000001A00730070005F006500780065006300750074006500730071006C00EA00000082001800E7206E0076006100720063006800610072002800390038002900C4000000530045004C004500430054000A00730070002E006E0061006D00650020004100530020005B004E0061006D0065005D000A00460052004F004D000A007300790073002E00640061007400610062006100730065005F00730063006F007000650064005F0063006F006E00660069006700750072006100740069006F006E0073002000410053002000730070000A00570048004500520045000A002800730070002E006E0061006D0065003D0040005F006D0073007000 -SQL:BatchStarting use [master] Core .Net SqlClient Data Provider sa 2064905136 66 2017-08-04 12:28:57.870 -SQL:BatchCompleted use [master] Core .Net SqlClient Data Provider sa 0 0 0 0 2064905136 66 2017-08-04 12:28:57.870 2017-08-04 12:28:57.870 -RPC:Completed exec sp_executesql N'SELECT -sp.name AS [Name], -sp.configuration_id AS [Id], -CAST( - CASE - WHEN SQL_VARIANT_PROPERTY(value,''BaseType'') = ''bit'' THEN - CASE value - WHEN 1 THEN ''ON'' - WHEN 0 THEN ''OFF'' - END - ELSE ISNULL(value, ''NULL'') - END - AS nvarchar(200)) AS [Value], -CAST( - CASE - WHEN SQL_VARIANT_PROPERTY(value_for_secondary,''BaseType'') = ''bit'' THEN - CASE value_for_secondary - WHEN 1 THEN ''ON'' - WHEN 0 THEN ''OFF'' - END - ELSE ISNULL(value_for_secondary, ''PRIMARY'') - END - AS nvarchar(200)) AS [ValueForSecondary] -FROM -sys.database_scoped_configurations AS sp -WHERE -(sp.name=@_msparam_0)',N'@_msparam_0 nvarchar(4000)',@_msparam_0=N'MAXDOP' Core .Net SqlClient Data Provider sa 0 10 0 0 2064905136 66 2017-08-04 12:28:57.873 2017-08-04 12:28:57.873 0X00000000040000001A00730070005F006500780065006300750074006500730071006C009A05000082001A00E7206E0076006100720063006800610072002800360039003700290072050000530045004C004500430054000A00730070002E006E0061006D00650020004100530020005B004E0061006D0065005D002C000A00730070002E0063006F006E00660069006700750072006100740069006F006E005F006900640020004100530020005B00490064005D002C000A00430041005300540028000A0020002000200020002000200043004100530045000A00200020002000200020002000200020005700480045004E002000530051004C005F005600 -SQL:BatchStarting use [master] Core .Net SqlClient Data Provider sa 2064905136 66 2017-08-04 12:28:57.877 -SQL:BatchCompleted use [master] Core .Net SqlClient Data Provider sa 0 0 0 0 2064905136 66 2017-08-04 12:28:57.877 2017-08-04 12:28:57.877 -RPC:Completed exec sp_executesql N'SELECT -sp.name AS [Name] -FROM -sys.database_scoped_configurations AS sp -WHERE -(sp.name=@_msparam_0)',N'@_msparam_0 nvarchar(4000)',@_msparam_0=N'Legacy_Cardinality_Estimation' Core .Net SqlClient Data Provider sa 0 8 0 0 2064905136 66 2017-08-04 12:28:57.880 2017-08-04 12:28:57.880 0X00000000040000001A00730070005F006500780065006300750074006500730071006C00EA00000082001800E7206E0076006100720063006800610072002800390038002900C4000000530045004C004500430054000A00730070002E006E0061006D00650020004100530020005B004E0061006D0065005D000A00460052004F004D000A007300790073002E00640061007400610062006100730065005F00730063006F007000650064005F0063006F006E00660069006700750072006100740069006F006E0073002000410053002000730070000A00570048004500520045000A002800730070002E006E0061006D0065003D0040005F006D0073007000 -SQL:BatchStarting use [master] Core .Net SqlClient Data Provider sa 2064905136 66 2017-08-04 12:28:57.880 -SQL:BatchCompleted use [master] Core .Net SqlClient Data Provider sa 0 0 0 0 2064905136 66 2017-08-04 12:28:57.880 2017-08-04 12:28:57.880 -RPC:Completed exec sp_executesql N'SELECT -sp.name AS [Name], -sp.configuration_id AS [Id], -CAST( - CASE - WHEN SQL_VARIANT_PROPERTY(value,''BaseType'') = ''bit'' THEN - CASE value - WHEN 1 THEN ''ON'' - WHEN 0 THEN ''OFF'' - END - ELSE ISNULL(value, ''NULL'') - END - AS nvarchar(200)) AS [Value], -CAST( - CASE - WHEN SQL_VARIANT_PROPERTY(value_for_secondary,''BaseType'') = ''bit'' THEN - CASE value_for_secondary - WHEN 1 THEN ''ON'' - WHEN 0 THEN ''OFF'' - END - ELSE ISNULL(value_for_secondary, ''PRIMARY'') - END - AS nvarchar(200)) AS [ValueForSecondary] -FROM -sys.database_scoped_configurations AS sp -WHERE -(sp.name=@_msparam_0)',N'@_msparam_0 nvarchar(4000)',@_msparam_0=N'Legacy_Cardinality_Estimation' Core .Net SqlClient Data Provider sa 0 10 0 0 2064905136 66 2017-08-04 12:28:57.880 2017-08-04 12:28:57.880 0X00000000040000001A00730070005F006500780065006300750074006500730071006C009A05000082001A00E7206E0076006100720063006800610072002800360039003700290072050000530045004C004500430054000A00730070002E006E0061006D00650020004100530020005B004E0061006D0065005D002C000A00730070002E0063006F006E00660069006700750072006100740069006F006E005F006900640020004100530020005B00490064005D002C000A00430041005300540028000A0020002000200020002000200043004100530045000A00200020002000200020002000200020005700480045004E002000530051004C005F005600 -SQL:BatchStarting use [master] Core .Net SqlClient Data Provider sa 2064905136 66 2017-08-04 12:28:57.883 -SQL:BatchCompleted use [master] Core .Net SqlClient Data Provider sa 0 0 0 0 2064905136 66 2017-08-04 12:28:57.883 2017-08-04 12:28:57.883 -RPC:Completed exec sp_executesql N'SELECT -sp.name AS [Name] -FROM -sys.database_scoped_configurations AS sp -WHERE -(sp.name=@_msparam_0)',N'@_msparam_0 nvarchar(4000)',@_msparam_0=N'Parameter_Sniffing' Core .Net SqlClient Data Provider sa 0 8 0 0 2064905136 66 2017-08-04 12:28:57.887 2017-08-04 12:28:57.887 0X00000000040000001A00730070005F006500780065006300750074006500730071006C00EA00000082001800E7206E0076006100720063006800610072002800390038002900C4000000530045004C004500430054000A00730070002E006E0061006D00650020004100530020005B004E0061006D0065005D000A00460052004F004D000A007300790073002E00640061007400610062006100730065005F00730063006F007000650064005F0063006F006E00660069006700750072006100740069006F006E0073002000410053002000730070000A00570048004500520045000A002800730070002E006E0061006D0065003D0040005F006D0073007000 -SQL:BatchStarting use [master] Core .Net SqlClient Data Provider sa 2064905136 66 2017-08-04 12:28:57.890 -SQL:BatchCompleted use [master] Core .Net SqlClient Data Provider sa 0 0 0 0 2064905136 66 2017-08-04 12:28:57.890 2017-08-04 12:28:57.890 -RPC:Completed exec sp_executesql N'SELECT -sp.name AS [Name], -sp.configuration_id AS [Id], -CAST( - CASE - WHEN SQL_VARIANT_PROPERTY(value,''BaseType'') = ''bit'' THEN - CASE value - WHEN 1 THEN ''ON'' - WHEN 0 THEN ''OFF'' - END - ELSE ISNULL(value, ''NULL'') - END - AS nvarchar(200)) AS [Value], -CAST( - CASE - WHEN SQL_VARIANT_PROPERTY(value_for_secondary,''BaseType'') = ''bit'' THEN - CASE value_for_secondary - WHEN 1 THEN ''ON'' - WHEN 0 THEN ''OFF'' - END - ELSE ISNULL(value_for_secondary, ''PRIMARY'') - END - AS nvarchar(200)) AS [ValueForSecondary] -FROM -sys.database_scoped_configurations AS sp -WHERE -(sp.name=@_msparam_0)',N'@_msparam_0 nvarchar(4000)',@_msparam_0=N'Parameter_Sniffing' Core .Net SqlClient Data Provider sa 0 10 0 0 2064905136 66 2017-08-04 12:28:57.890 2017-08-04 12:28:57.890 0X00000000040000001A00730070005F006500780065006300750074006500730071006C009A05000082001A00E7206E0076006100720063006800610072002800360039003700290072050000530045004C004500430054000A00730070002E006E0061006D00650020004100530020005B004E0061006D0065005D002C000A00730070002E0063006F006E00660069006700750072006100740069006F006E005F006900640020004100530020005B00490064005D002C000A00430041005300540028000A0020002000200020002000200043004100530045000A00200020002000200020002000200020005700480045004E002000530051004C005F005600 -SQL:BatchStarting use [master] Core .Net SqlClient Data Provider sa 2064905136 66 2017-08-04 12:28:57.893 -SQL:BatchCompleted use [master] Core .Net SqlClient Data Provider sa 0 0 0 0 2064905136 66 2017-08-04 12:28:57.893 2017-08-04 12:28:57.893 -RPC:Completed exec sp_executesql N'SELECT -sp.name AS [Name] -FROM -sys.database_scoped_configurations AS sp -WHERE -(sp.name=@_msparam_0)',N'@_msparam_0 nvarchar(4000)',@_msparam_0=N'Query_Optimizer_Hotfixes' Core .Net SqlClient Data Provider sa 0 8 0 0 2064905136 66 2017-08-04 12:28:57.893 2017-08-04 12:28:57.893 0X00000000040000001A00730070005F006500780065006300750074006500730071006C00EA00000082001800E7206E0076006100720063006800610072002800390038002900C4000000530045004C004500430054000A00730070002E006E0061006D00650020004100530020005B004E0061006D0065005D000A00460052004F004D000A007300790073002E00640061007400610062006100730065005F00730063006F007000650064005F0063006F006E00660069006700750072006100740069006F006E0073002000410053002000730070000A00570048004500520045000A002800730070002E006E0061006D0065003D0040005F006D0073007000 -SQL:BatchStarting use [master] Core .Net SqlClient Data Provider sa 2064905136 66 2017-08-04 12:28:57.897 -SQL:BatchCompleted use [master] Core .Net SqlClient Data Provider sa 0 0 0 0 2064905136 66 2017-08-04 12:28:57.897 2017-08-04 12:28:57.897 -RPC:Completed exec sp_executesql N'SELECT -sp.name AS [Name], -sp.configuration_id AS [Id], -CAST( - CASE - WHEN SQL_VARIANT_PROPERTY(value,''BaseType'') = ''bit'' THEN - CASE value - WHEN 1 THEN ''ON'' - WHEN 0 THEN ''OFF'' - END - ELSE ISNULL(value, ''NULL'') - END - AS nvarchar(200)) AS [Value], -CAST( - CASE - WHEN SQL_VARIANT_PROPERTY(value_for_secondary,''BaseType'') = ''bit'' THEN - CASE value_for_secondary - WHEN 1 THEN ''ON'' - WHEN 0 THEN ''OFF'' - END - ELSE ISNULL(value_for_secondary, ''PRIMARY'') - END - AS nvarchar(200)) AS [ValueForSecondary] -FROM -sys.database_scoped_configurations AS sp -WHERE -(sp.name=@_msparam_0)',N'@_msparam_0 nvarchar(4000)',@_msparam_0=N'Query_Optimizer_Hotfixes' Core .Net SqlClient Data Provider sa 0 10 0 0 2064905136 66 2017-08-04 12:28:57.897 2017-08-04 12:28:57.897 0X00000000040000001A00730070005F006500780065006300750074006500730071006C009A05000082001A00E7206E0076006100720063006800610072002800360039003700290072050000530045004C004500430054000A00730070002E006E0061006D00650020004100530020005B004E0061006D0065005D002C000A00730070002E0063006F006E00660069006700750072006100740069006F006E005F006900640020004100530020005B00490064005D002C000A00430041005300540028000A0020002000200020002000200043004100530045000A00200020002000200020002000200020005700480045004E002000530051004C005F005600 -SQL:BatchStarting use [master] Core .Net SqlClient Data Provider sa 2064905136 66 2017-08-04 12:28:57.903 -SQL:BatchCompleted use [master] Core .Net SqlClient Data Provider sa 0 0 0 0 2064905136 66 2017-08-04 12:28:57.903 2017-08-04 12:28:57.903 -SQL:BatchStarting - DECLARE @is_policy_automation_enabled bit - SET @is_policy_automation_enabled = (SELECT CONVERT(bit, current_value) - FROM msdb.dbo.syspolicy_configuration - WHERE name = 'Enabled') - - - -SELECT -CAST(cast(g.name as varbinary(256)) AS sysname) AS [Name], -g.data_space_id AS [ID], -CAST(g.is_default AS bit) AS [IsDefault], -g.is_read_only AS [ReadOnly], -CAST(ISNULL((select sum(cast(gs.size as float))*convert(float,8) from sys.database_files gs where gs.data_space_id = g.data_space_id), 0) AS float) AS [Size], -CASE g.type WHEN 'FG' THEN 0 WHEN 'PS' THEN 1 WHEN 'FD' THEN 2 WHEN 'FX' THEN 3 END AS [FileGroupType], -CAST(CASE WHEN 'FD'=g.type THEN 1 ELSE 0 END AS bit) AS [IsFileStream], -case when 1=@is_policy_automation_enabled and exists (select * from msdb.dbo.syspolicy_system_health_state where target_query_expression_with_id like 'Server' + '/Database\[@ID=' + convert(nvarchar(20),dtb.database_id) + '\]'+ '/FileGroup\[@ID=' + convert(nvarchar(20),g.data_space_id) + '\]%' ESCAPE '\') then 1 else 0 end AS [PolicyHealthState] -FROM -master.sys.databases AS dtb, -sys.filegroups AS g -WHERE -(dtb.name=db_name()) -ORDER BY -[Name] ASC Core .Net SqlClient Data Provider sa 2064905136 66 2017-08-04 12:28:57.907 -SQL:BatchCompleted - DECLARE @is_policy_automation_enabled bit - SET @is_policy_automation_enabled = (SELECT CONVERT(bit, current_value) - FROM msdb.dbo.syspolicy_configuration - WHERE name = 'Enabled') - - - -SELECT -CAST(cast(g.name as varbinary(256)) AS sysname) AS [Name], -g.data_space_id AS [ID], -CAST(g.is_default AS bit) AS [IsDefault], -g.is_read_only AS [ReadOnly], -CAST(ISNULL((select sum(cast(gs.size as float))*convert(float,8) from sys.database_files gs where gs.data_space_id = g.data_space_id), 0) AS float) AS [Size], -CASE g.type WHEN 'FG' THEN 0 WHEN 'PS' THEN 1 WHEN 'FD' THEN 2 WHEN 'FX' THEN 3 END AS [FileGroupType], -CAST(CASE WHEN 'FD'=g.type THEN 1 ELSE 0 END AS bit) AS [IsFileStream], -case when 1=@is_policy_automation_enabled and exists (select * from msdb.dbo.syspolicy_system_health_state where target_query_expression_with_id like 'Server' + '/Database\[@ID=' + convert(nvarchar(20),dtb.database_id) + '\]'+ '/FileGroup\[@ID=' + convert(nvarchar(20),g.data_space_id) + '\]%' ESCAPE '\') then 1 else 0 end AS [PolicyHealthState] -FROM -master.sys.databases AS dtb, -sys.filegroups AS g -WHERE -(dtb.name=db_name()) -ORDER BY -[Name] ASC Core .Net SqlClient Data Provider sa 0 14 0 0 2064905136 66 2017-08-04 12:28:57.907 2017-08-04 12:28:57.907 -SQL:BatchStarting use [master] Core .Net SqlClient Data Provider sa 2064905136 66 2017-08-04 12:28:57.913 -SQL:BatchCompleted use [master] Core .Net SqlClient Data Provider sa 0 0 0 0 2064905136 66 2017-08-04 12:28:57.913 2017-08-04 12:28:57.913 -RPC:Completed exec sp_executesql N' with s as ( -select df.[type] as [type], -df.name collate database_default as name, -df.drop_lsn as drop_lsn, -dtb.database_id as database_id, -df.[file_id] as [file_id], -df.max_size as max_size, -df.growth as growth, -df.is_percent_growth as is_percent_growth, -df.is_media_read_only as is_media_read_only, -df.is_read_only as is_read_only, -df.[state] as [state], -df.is_sparse as is_sparse, -df.data_space_id as data_space_id, -df.physical_name collate database_default as physical_name, -df.size as size - from sys.database_files as df inner join sys.databases as dtb - on (db_id() = dtb.database_id) - and (df.type = 2 or df.type = 0) - and (df.drop_lsn is null) - where - (dtb.source_database_id is null) -union -select -mf.[type] as [type], -mf.name collate database_default as name, -mf.drop_lsn as drop_lsn, -mf.database_id as database_id, -mf.[file_id] as [file_id], -mf.max_size as max_size, -mf.growth as growth, -mf.is_percent_growth as is_percent_growth, -mf.is_media_read_only as is_media_read_only, -mf.is_read_only as is_read_only, -mf.[state] as [state], -mf.is_sparse as is_sparse, -mf.data_space_id as data_space_id, -mf.physical_name collate database_default as physical_name, -mf.size as size - from sys.master_files as mf inner join sys.databases as db - on (mf.database_id = db.database_id) - and (mf.type = 2 or mf.type = 0) - and (mf.drop_lsn is null) - and (db.source_database_id is not null) - where mf.database_id = db_id()) - - - -SELECT -s.name AS [Name], -CAST(CASE s.file_id WHEN 1 THEN 1 ELSE 0 END AS bit) AS [IsPrimaryFile], -CAST(CASE when s.growth=0 THEN (CASE WHEN s.type = 2 THEN 0 ELSE 99 END) ELSE s.is_percent_growth END AS int) AS [GrowthType], -s.physical_name AS [FileName], -s.size * CONVERT(float,8) AS [Size], -CASE when s.max_size=-1 then -1 else s.max_size * CONVERT(float,8) END AS [MaxSize], -s.file_id AS [ID], -''Server[@Name='' + quotename(CAST( - serverproperty(N''Servername'') - AS sysname),'''''''') + '']'' + ''/Database[@Name='' + quotename(db_name(),'''''''') + '']'' + ''/FileGroup[@Name='' + quotename(CAST(cast(g.name as varbinary(256)) AS sysname),'''''''') + '']'' + ''/File[@Name='' + quotename(s.name,'''''''') + '']'' AS [Urn], -CAST(CASE s.is_percent_growth WHEN 1 THEN s.growth ELSE s.growth*8 END AS float) AS [Growth], -s.is_media_read_only AS [IsReadOnlyMedia], -s.is_read_only AS [IsReadOnly], -CAST(case s.state when 6 then 1 else 0 end AS bit) AS [IsOffline], -s.is_sparse AS [IsSparse] -FROM -sys.filegroups AS g -INNER JOIN s ON s.data_space_id=g.data_space_id -WHERE -(CAST(cast(g.name as varbinary(256)) AS sysname)=@_msparam_0) -ORDER BY -[Name] ASC',N'@_msparam_0 nvarchar(4000)',@_msparam_0=N'PRIMARY' Core .Net SqlClient Data Provider sa 0 12 0 0 2064905136 66 2017-08-04 12:28:57.917 2017-08-04 12:28:57.917 0X00000000040000001A00730070005F006500780065006300750074006500730071006C001615000082001C00E7206E007600610072006300680061007200280032003600370038002900EC14000020002000770069007400680020007300200061007300200028000A00730065006C006500630074002000640066002E005B0074007900700065005D0020006100730020005B0074007900700065005D002C000A00640066002E006E0061006D006500200063006F006C006C006100740065002000640061007400610062006100730065005F00640065006600610075006C00740020006100730020006E0061006D0065002C000A00640066002E0064007200 -SQL:BatchStarting use [master] Core .Net SqlClient Data Provider sa 2064905136 66 2017-08-04 12:28:57.943 -SQL:BatchCompleted use [master] Core .Net SqlClient Data Provider sa 0 0 0 0 2064905136 66 2017-08-04 12:28:57.943 2017-08-04 12:28:57.943 -SQL:BatchStarting SELECT -s.name AS [Name], -CAST(FILEPROPERTY(s.name, 'SpaceUsed') AS float)* CONVERT(float,8) AS [UsedSpace], -CAST(CASE when s.growth=0 THEN (CASE WHEN s.type = 2 THEN 0 ELSE 99 END) ELSE s.is_percent_growth END AS int) AS [GrowthType], -s.physical_name AS [FileName], -s.size * CONVERT(float,8) AS [Size], -CASE when s.max_size=-1 then -1 else s.max_size * CONVERT(float,8) END AS [MaxSize], -s.file_id AS [ID], -'Server[@Name=' + quotename(CAST( - serverproperty(N'Servername') - AS sysname),'''') + ']' + '/Database[@Name=' + quotename(db_name(),'''') + ']' + '/LogFile[@Name=' + quotename(s.name,'''') + ']' AS [Urn], -CAST(CASE s.is_percent_growth WHEN 1 THEN s.growth ELSE s.growth*8 END AS float) AS [Growth], -s.is_media_read_only AS [IsReadOnlyMedia], -s.is_read_only AS [IsReadOnly], -CAST(case s.state when 6 then 1 else 0 end AS bit) AS [IsOffline], -s.is_sparse AS [IsSparse] -FROM -sys.database_files AS s -WHERE -(s.type = 1) -ORDER BY -[Name] ASC Core .Net SqlClient Data Provider sa 2064905136 66 2017-08-04 12:28:57.943 -SQL:BatchCompleted SELECT -s.name AS [Name], -CAST(FILEPROPERTY(s.name, 'SpaceUsed') AS float)* CONVERT(float,8) AS [UsedSpace], -CAST(CASE when s.growth=0 THEN (CASE WHEN s.type = 2 THEN 0 ELSE 99 END) ELSE s.is_percent_growth END AS int) AS [GrowthType], -s.physical_name AS [FileName], -s.size * CONVERT(float,8) AS [Size], -CASE when s.max_size=-1 then -1 else s.max_size * CONVERT(float,8) END AS [MaxSize], -s.file_id AS [ID], -'Server[@Name=' + quotename(CAST( - serverproperty(N'Servername') - AS sysname),'''') + ']' + '/Database[@Name=' + quotename(db_name(),'''') + ']' + '/LogFile[@Name=' + quotename(s.name,'''') + ']' AS [Urn], -CAST(CASE s.is_percent_growth WHEN 1 THEN s.growth ELSE s.growth*8 END AS float) AS [Growth], -s.is_media_read_only AS [IsReadOnlyMedia], -s.is_read_only AS [IsReadOnly], -CAST(case s.state when 6 then 1 else 0 end AS bit) AS [IsOffline], -s.is_sparse AS [IsSparse] -FROM -sys.database_files AS s -WHERE -(s.type = 1) -ORDER BY -[Name] ASC Core .Net SqlClient Data Provider sa 0 6 0 0 2064905136 66 2017-08-04 12:28:57.943 2017-08-04 12:28:57.943 -Audit Login -- network protocol: TCP/IP -set quoted_identifier on -set arithabort off -set numeric_roundabort off -set ansi_warnings on -set ansi_padding on -set ansi_nulls on -set concat_null_yields_null on -set cursor_close_on_commit off -set implicit_transactions off -set language us_english -set dateformat mdy -set datefirst 7 -set transaction isolation level read committed - carbon sa 2064905136 67 2017-08-04 12:28:57.980 -SQL:BatchStarting SELECT s.name AS schema_name, o.[name] AS object_name, o.[type] AS object_type - FROM sys.all_objects o - INNER JOIN sys.schemas s ON o.schema_id = s.schema_id - WHERE (o.[type] = 'P' OR o.[type] = 'V' OR o.[type] = 'U') ORDER BY object_type, schema_name, object_name carbon sa 2064905136 67 2017-08-04 12:28:57.980 -SQL:BatchCompleted SELECT s.name AS schema_name, o.[name] AS object_name, o.[type] AS object_type - FROM sys.all_objects o - INNER JOIN sys.schemas s ON o.schema_id = s.schema_id - WHERE (o.[type] = 'P' OR o.[type] = 'V' OR o.[type] = 'U') ORDER BY object_type, schema_name, object_name carbon sa 31 100 0 42 2064905136 67 2017-08-04 12:28:57.980 2017-08-04 12:28:58.023 -Audit Logout carbon sa 31 100 0 438790 2064905136 67 2017-08-04 12:28:57.980 2017-08-04 12:36:16.770 -Audit Logout carbon sa 16 187 0 495447 2064905136 63 2017-08-04 12:28:56.763 2017-08-04 12:37:12.210 -Audit Logout carbon sa 0 5 0 495374 2064905136 65 2017-08-04 12:28:56.837 2017-08-04 12:37:12.210 -Audit Logout carbon sa 0 15 0 495664 2064905136 62 2017-08-04 12:28:56.547 2017-08-04 12:37:12.210 -Audit Logout Core .Net SqlClient Data Provider sa 47 1113 2 494910 2064905136 66 2017-08-04 12:28:57.300 2017-08-04 12:37:12.210 -Audit Login -- network protocol: TCP/IP -set quoted_identifier on -set arithabort off -set numeric_roundabort off -set ansi_warnings on -set ansi_padding on -set ansi_nulls on -set concat_null_yields_null on -set cursor_close_on_commit off -set implicit_transactions off -set language us_english -set dateformat mdy -set datefirst 7 -set transaction isolation level read committed - carbon sa 1881496663 51 2017-08-04 14:13:03.783 -SQL:BatchStarting SELECT SERVERPROPERTY('EngineEdition'), SERVERPROPERTY('productversion'), SERVERPROPERTY ('productlevel'), SERVERPROPERTY ('edition'), SERVERPROPERTY ('MachineName'), (SELECT CASE WHEN EXISTS (SELECT TOP 1 1 from [sys].[all_columns] WITH (NOLOCK) WHERE name = N'xml_index_type' AND OBJECT_ID(N'sys.xml_indexes') = object_id) THEN 1 ELSE 0 END AS SXI_PRESENT) carbon sa 1881496663 51 2017-08-04 14:13:03.933 -SQL:BatchCompleted SELECT SERVERPROPERTY('EngineEdition'), SERVERPROPERTY('productversion'), SERVERPROPERTY ('productlevel'), SERVERPROPERTY ('edition'), SERVERPROPERTY ('MachineName'), (SELECT CASE WHEN EXISTS (SELECT TOP 1 1 from [sys].[all_columns] WITH (NOLOCK) WHERE name = N'xml_index_type' AND OBJECT_ID(N'sys.xml_indexes') = object_id) THEN 1 ELSE 0 END AS SXI_PRESENT) carbon sa 0 5 0 0 1881496663 51 2017-08-04 14:13:03.933 2017-08-04 14:13:03.933 -SQL:BatchStarting SELECT ISNULL(SESSIONPROPERTY ('ANSI_NULLS'), 0), ISNULL(SESSIONPROPERTY ('QUOTED_IDENTIFIER'), 1) carbon sa 1881496663 51 2017-08-04 14:13:04.000 -SQL:BatchCompleted SELECT ISNULL(SESSIONPROPERTY ('ANSI_NULLS'), 0), ISNULL(SESSIONPROPERTY ('QUOTED_IDENTIFIER'), 1) carbon sa 0 0 0 0 1881496663 51 2017-08-04 14:13:04.000 2017-08-04 14:13:04.000 -SQL:BatchStarting SELECT SERVERPROPERTY('EngineEdition'), SERVERPROPERTY('productversion'), SERVERPROPERTY ('productlevel'), SERVERPROPERTY ('edition'), SERVERPROPERTY ('MachineName'), (SELECT CASE WHEN EXISTS (SELECT TOP 1 1 from [sys].[all_columns] WITH (NOLOCK) WHERE name = N'xml_index_type' AND OBJECT_ID(N'sys.xml_indexes') = object_id) THEN 1 ELSE 0 END AS SXI_PRESENT) carbon sa 1881496663 51 2017-08-04 14:13:04.003 -SQL:BatchCompleted SELECT SERVERPROPERTY('EngineEdition'), SERVERPROPERTY('productversion'), SERVERPROPERTY ('productlevel'), SERVERPROPERTY ('edition'), SERVERPROPERTY ('MachineName'), (SELECT CASE WHEN EXISTS (SELECT TOP 1 1 from [sys].[all_columns] WITH (NOLOCK) WHERE name = N'xml_index_type' AND OBJECT_ID(N'sys.xml_indexes') = object_id) THEN 1 ELSE 0 END AS SXI_PRESENT) carbon sa 0 5 0 0 1881496663 51 2017-08-04 14:13:04.003 2017-08-04 14:13:04.003 -SQL:BatchStarting SELECT ISNULL(SESSIONPROPERTY ('ANSI_NULLS'), 0), ISNULL(SESSIONPROPERTY ('QUOTED_IDENTIFIER'), 1) carbon sa 1881496663 51 2017-08-04 14:13:04.007 -SQL:BatchCompleted SELECT ISNULL(SESSIONPROPERTY ('ANSI_NULLS'), 0), ISNULL(SESSIONPROPERTY ('QUOTED_IDENTIFIER'), 1) carbon sa 0 0 0 0 1881496663 51 2017-08-04 14:13:04.007 2017-08-04 14:13:04.007 -SQL:BatchStarting SELECT CONVERT(NVARCHAR(36), CONTEXT_INFO()) carbon sa 1881496663 51 2017-08-04 14:13:04.013 -SQL:BatchCompleted SELECT CONVERT(NVARCHAR(36), CONTEXT_INFO()) carbon sa 0 0 0 0 1881496663 51 2017-08-04 14:13:04.013 2017-08-04 14:13:04.013 -SQL:BatchStarting set LOCK_TIMEOUT 5000 carbon sa 1881496663 51 2017-08-04 14:13:04.023 -SQL:BatchCompleted set LOCK_TIMEOUT 5000 carbon sa 0 0 0 0 1881496663 51 2017-08-04 14:13:04.023 2017-08-04 14:13:04.023 -SQL:BatchStarting SET ANSI_NULLS, ANSI_PADDING, ANSI_WARNINGS, ARITHABORT, CONCAT_NULL_YIELDS_NULL, QUOTED_IDENTIFIER ON; -SET NUMERIC_ROUNDABORT OFF; carbon sa 1881496663 51 2017-08-04 14:13:04.030 -SQL:BatchCompleted SET ANSI_NULLS, ANSI_PADDING, ANSI_WARNINGS, ARITHABORT, CONCAT_NULL_YIELDS_NULL, QUOTED_IDENTIFIER ON; -SET NUMERIC_ROUNDABORT OFF; carbon sa 0 0 0 0 1881496663 51 2017-08-04 14:13:04.030 2017-08-04 14:13:04.030 -SQL:BatchStarting SELECT SERVERPROPERTY('EngineEdition'), SERVERPROPERTY('productversion'), SERVERPROPERTY ('productlevel'), SERVERPROPERTY ('edition'), SERVERPROPERTY ('MachineName'), (SELECT CASE WHEN EXISTS (SELECT TOP 1 1 from [sys].[all_columns] WITH (NOLOCK) WHERE name = N'xml_index_type' AND OBJECT_ID(N'sys.xml_indexes') = object_id) THEN 1 ELSE 0 END AS SXI_PRESENT) carbon sa 1881496663 51 2017-08-04 14:13:04.040 -SQL:BatchCompleted SELECT SERVERPROPERTY('EngineEdition'), SERVERPROPERTY('productversion'), SERVERPROPERTY ('productlevel'), SERVERPROPERTY ('edition'), SERVERPROPERTY ('MachineName'), (SELECT CASE WHEN EXISTS (SELECT TOP 1 1 from [sys].[all_columns] WITH (NOLOCK) WHERE name = N'xml_index_type' AND OBJECT_ID(N'sys.xml_indexes') = object_id) THEN 1 ELSE 0 END AS SXI_PRESENT) carbon sa 0 5 0 0 1881496663 51 2017-08-04 14:13:04.040 2017-08-04 14:13:04.040 -SQL:BatchStarting SELECT OSVersion = RIGHT(@@version, LEN(@@version)- 3 -charindex (' ON ', @@version)) carbon sa 1881496663 51 2017-08-04 14:13:04.043 -SQL:BatchCompleted SELECT OSVersion = RIGHT(@@version, LEN(@@version)- 3 -charindex (' ON ', @@version)) carbon sa 0 0 0 0 1881496663 51 2017-08-04 14:13:04.043 2017-08-04 14:13:04.043 -Audit Login -- network protocol: TCP/IP -set quoted_identifier on -set arithabort off -set numeric_roundabort off -set ansi_warnings on -set ansi_padding on -set ansi_nulls on -set concat_null_yields_null on -set cursor_close_on_commit off -set implicit_transactions off -set language us_english -set dateformat mdy -set datefirst 7 -set transaction isolation level read committed - carbon sa 1881496663 56 2017-08-04 14:13:04.133 -SQL:BatchStarting DECLARE @edition sysname; SET @edition = cast(SERVERPROPERTY(N'EDITION') as sysname); select case when @edition = N'SQL Azure' then 2 else 1 end as 'DatabaseEngineType'; -SELECT SERVERPROPERTY('EngineEdition') AS DatabaseEngineEdition -select N'Windows' as host_platform - carbon sa 1881496663 56 2017-08-04 14:13:04.513 -SQL:BatchCompleted DECLARE @edition sysname; SET @edition = cast(SERVERPROPERTY(N'EDITION') as sysname); select case when @edition = N'SQL Azure' then 2 else 1 end as 'DatabaseEngineType'; -SELECT SERVERPROPERTY('EngineEdition') AS DatabaseEngineEdition -select N'Windows' as host_platform - carbon sa 0 0 0 0 1881496663 56 2017-08-04 14:13:04.513 2017-08-04 14:13:04.513 -SQL:BatchStarting select SERVERPROPERTY(N'servername') carbon sa 1881496663 56 2017-08-04 14:13:04.657 -SQL:BatchCompleted select SERVERPROPERTY(N'servername') carbon sa 0 0 0 0 1881496663 56 2017-08-04 14:13:04.657 2017-08-04 14:13:04.657 -SQL:BatchStarting use [master]; -if (db_id() = 1) -begin --- contained auth is 0 when connected to master -select 0 -end -else -begin --- need dynamic sql so that we compile this query only when we know resource db is available -exec('select case when authenticating_database_id = 1 then 0 else 1 end from -sys.dm_exec_sessions where session_id = @@SPID') -end;use [master]; --resetting the context carbon sa 1881496663 56 2017-08-04 14:13:04.683 -SQL:BatchCompleted use [master]; -if (db_id() = 1) -begin --- contained auth is 0 when connected to master -select 0 -end -else -begin --- need dynamic sql so that we compile this query only when we know resource db is available -exec('select case when authenticating_database_id = 1 then 0 else 1 end from -sys.dm_exec_sessions where session_id = @@SPID') -end;use [master]; --resetting the context carbon sa 0 0 0 0 1881496663 56 2017-08-04 14:13:04.683 2017-08-04 14:13:04.683 -SQL:BatchStarting SELECT -CAST( - serverproperty(N'Servername') - AS sysname) AS [Name] carbon sa 1881496663 56 2017-08-04 14:13:04.873 -SQL:BatchCompleted SELECT -CAST( - serverproperty(N'Servername') - AS sysname) AS [Name] carbon sa 0 0 0 0 1881496663 56 2017-08-04 14:13:04.873 2017-08-04 14:13:04.873 -SQL:BatchStarting - declare @MasterPath nvarchar(512) - declare @LogPath nvarchar(512) - declare @ErrorLog nvarchar(512) - declare @ErrorLogPath nvarchar(512) - - select @MasterPath=substring(physical_name, 1, len(physical_name) - charindex('\', reverse(physical_name))) from master.sys.database_files where name=N'master' - select @LogPath=substring(physical_name, 1, len(physical_name) - charindex('\', reverse(physical_name))) from master.sys.database_files where name=N'mastlog' - select @ErrorLog=cast(SERVERPROPERTY(N'errorlogfilename') as nvarchar(512)) - select @ErrorLogPath=substring(@ErrorLog, 1, len(@ErrorLog) - charindex('\', reverse(@ErrorLog))) - - - - declare @SmoRoot nvarchar(512) - exec master.dbo.xp_instance_regread N'HKEY_LOCAL_MACHINE', N'SOFTWARE\Microsoft\MSSQLServer\Setup', N'SQLPath', @SmoRoot OUTPUT - - - -SELECT -CAST(case when 'a' <> 'A' then 1 else 0 end AS bit) AS [IsCaseSensitive], -@@MAX_PRECISION AS [MaxPrecision], -@ErrorLogPath AS [ErrorLogPath], -@SmoRoot AS [RootDirectory], -N'Windows' AS [HostPlatform], -N'\' AS [PathSeparator], -CAST(FULLTEXTSERVICEPROPERTY('IsFullTextInstalled') AS bit) AS [IsFullTextInstalled], -@LogPath AS [MasterDBLogPath], -@MasterPath AS [MasterDBPath], -SERVERPROPERTY(N'ProductVersion') AS [VersionString], -CAST(SERVERPROPERTY(N'Edition') AS sysname) AS [Edition], -CAST(SERVERPROPERTY(N'ProductLevel') AS sysname) AS [ProductLevel], -CAST(SERVERPROPERTY('IsSingleUser') AS bit) AS [IsSingleUser], -CAST(SERVERPROPERTY('EngineEdition') AS int) AS [EngineEdition], -convert(sysname, serverproperty(N'collation')) AS [Collation], -CAST(SERVERPROPERTY(N'MachineName') AS sysname) AS [NetName], -CAST(SERVERPROPERTY('IsClustered') AS bit) AS [IsClustered], -SERVERPROPERTY(N'ResourceVersion') AS [ResourceVersionString], -SERVERPROPERTY(N'ResourceLastUpdateDateTime') AS [ResourceLastUpdateDateTime], -SERVERPROPERTY(N'CollationID') AS [CollationID], -SERVERPROPERTY(N'ComparisonStyle') AS [ComparisonStyle], -SERVERPROPERTY(N'SqlCharSet') AS [SqlCharSet], -SERVERPROPERTY(N'SqlCharSetName') AS [SqlCharSetName], -SERVERPROPERTY(N'SqlSortOrder') AS [SqlSortOrder], -SERVERPROPERTY(N'SqlSortOrderName') AS [SqlSortOrderName], -SERVERPROPERTY(N'BuildClrVersion') AS [BuildClrVersionString], -SERVERPROPERTY(N'ComputerNamePhysicalNetBIOS') AS [ComputerNamePhysicalNetBIOS], -CAST(SERVERPROPERTY('IsPolyBaseInstalled') AS bit) AS [IsPolyBaseInstalled] carbon sa 1881496663 56 2017-08-04 14:13:04.937 -SQL:BatchCompleted - declare @MasterPath nvarchar(512) - declare @LogPath nvarchar(512) - declare @ErrorLog nvarchar(512) - declare @ErrorLogPath nvarchar(512) - - select @MasterPath=substring(physical_name, 1, len(physical_name) - charindex('\', reverse(physical_name))) from master.sys.database_files where name=N'master' - select @LogPath=substring(physical_name, 1, len(physical_name) - charindex('\', reverse(physical_name))) from master.sys.database_files where name=N'mastlog' - select @ErrorLog=cast(SERVERPROPERTY(N'errorlogfilename') as nvarchar(512)) - select @ErrorLogPath=substring(@ErrorLog, 1, len(@ErrorLog) - charindex('\', reverse(@ErrorLog))) - - - - declare @SmoRoot nvarchar(512) - exec master.dbo.xp_instance_regread N'HKEY_LOCAL_MACHINE', N'SOFTWARE\Microsoft\MSSQLServer\Setup', N'SQLPath', @SmoRoot OUTPUT - - - -SELECT -CAST(case when 'a' <> 'A' then 1 else 0 end AS bit) AS [IsCaseSensitive], -@@MAX_PRECISION AS [MaxPrecision], -@ErrorLogPath AS [ErrorLogPath], -@SmoRoot AS [RootDirectory], -N'Windows' AS [HostPlatform], -N'\' AS [PathSeparator], -CAST(FULLTEXTSERVICEPROPERTY('IsFullTextInstalled') AS bit) AS [IsFullTextInstalled], -@LogPath AS [MasterDBLogPath], -@MasterPath AS [MasterDBPath], -SERVERPROPERTY(N'ProductVersion') AS [VersionString], -CAST(SERVERPROPERTY(N'Edition') AS sysname) AS [Edition], -CAST(SERVERPROPERTY(N'ProductLevel') AS sysname) AS [ProductLevel], -CAST(SERVERPROPERTY('IsSingleUser') AS bit) AS [IsSingleUser], -CAST(SERVERPROPERTY('EngineEdition') AS int) AS [EngineEdition], -convert(sysname, serverproperty(N'collation')) AS [Collation], -CAST(SERVERPROPERTY(N'MachineName') AS sysname) AS [NetName], -CAST(SERVERPROPERTY('IsClustered') AS bit) AS [IsClustered], -SERVERPROPERTY(N'ResourceVersion') AS [ResourceVersionString], -SERVERPROPERTY(N'ResourceLastUpdateDateTime') AS [ResourceLastUpdateDateTime], -SERVERPROPERTY(N'CollationID') AS [CollationID], -SERVERPROPERTY(N'ComparisonStyle') AS [ComparisonStyle], -SERVERPROPERTY(N'SqlCharSet') AS [SqlCharSet], -SERVERPROPERTY(N'SqlCharSetName') AS [SqlCharSetName], -SERVERPROPERTY(N'SqlSortOrder') AS [SqlSortOrder], -SERVERPROPERTY(N'SqlSortOrderName') AS [SqlSortOrderName], -SERVERPROPERTY(N'BuildClrVersion') AS [BuildClrVersionString], -SERVERPROPERTY(N'ComputerNamePhysicalNetBIOS') AS [ComputerNamePhysicalNetBIOS], -CAST(SERVERPROPERTY('IsPolyBaseInstalled') AS bit) AS [IsPolyBaseInstalled] carbon sa 0 5 0 2 1881496663 56 2017-08-04 14:13:04.937 2017-08-04 14:13:04.940 -RPC:Completed exec sp_executesql N'SELECT -dtb.collation_name AS [Collation], -dtb.name AS [DatabaseName2] -FROM -master.sys.databases AS dtb -WHERE -(dtb.name=@_msparam_0)',N'@_msparam_0 nvarchar(4000)',@_msparam_0=N'master' carbon sa 0 8 0 0 1881496663 56 2017-08-04 14:13:05.107 2017-08-04 14:13:05.107 0X00000000040000001A00730070005F006500780065006300750074006500730071006C002E01000082001A00E7206E0076006100720063006800610072002800310033003100290006010000530045004C004500430054000A006400740062002E0063006F006C006C006100740069006F006E005F006E0061006D00650020004100530020005B0043006F006C006C006100740069006F006E005D002C000A006400740062002E006E0061006D00650020004100530020005B00440061007400610062006100730065004E0061006D00650032005D000A00460052004F004D000A006D00610073007400650072002E007300790073002E006400610074006100 -SQL:BatchStarting SELECT -dtb.name AS [Name], -dtb.database_id AS [ID], -CAST(case when dtb.name in ('master','model','msdb','tempdb') then 1 else dtb.is_distributor end AS bit) AS [IsSystemObject], -dtb.collation_name AS [Collation], -CAST(has_dbaccess(dtb.name) AS bit) AS [IsAccessible], -dtb.name AS [DatabaseName2] -FROM -master.sys.databases AS dtb -ORDER BY -[Name] ASC carbon sa 1881496663 56 2017-08-04 14:13:05.150 -SQL:BatchCompleted SELECT -dtb.name AS [Name], -dtb.database_id AS [ID], -CAST(case when dtb.name in ('master','model','msdb','tempdb') then 1 else dtb.is_distributor end AS bit) AS [IsSystemObject], -dtb.collation_name AS [Collation], -CAST(has_dbaccess(dtb.name) AS bit) AS [IsAccessible], -dtb.name AS [DatabaseName2] -FROM -master.sys.databases AS dtb -ORDER BY -[Name] ASC carbon sa 16 174 0 13 1881496663 56 2017-08-04 14:13:05.150 2017-08-04 14:13:05.163 -Audit Login -- network protocol: TCP/IP -set quoted_identifier on -set arithabort off -set numeric_roundabort off -set ansi_warnings on -set ansi_padding on -set ansi_nulls on -set concat_null_yields_null on -set cursor_close_on_commit off -set implicit_transactions off -set language us_english -set dateformat mdy -set datefirst 7 -set transaction isolation level read committed - carbon sa 1881496663 57 2017-08-04 14:13:07.510 -SQL:BatchStarting SELECT SERVERPROPERTY('EngineEdition'), SERVERPROPERTY('productversion'), SERVERPROPERTY ('productlevel'), SERVERPROPERTY ('edition'), SERVERPROPERTY ('MachineName'), (SELECT CASE WHEN EXISTS (SELECT TOP 1 1 from [sys].[all_columns] WITH (NOLOCK) WHERE name = N'xml_index_type' AND OBJECT_ID(N'sys.xml_indexes') = object_id) THEN 1 ELSE 0 END AS SXI_PRESENT) carbon sa 1881496663 57 2017-08-04 14:13:07.513 -SQL:BatchCompleted SELECT SERVERPROPERTY('EngineEdition'), SERVERPROPERTY('productversion'), SERVERPROPERTY ('productlevel'), SERVERPROPERTY ('edition'), SERVERPROPERTY ('MachineName'), (SELECT CASE WHEN EXISTS (SELECT TOP 1 1 from [sys].[all_columns] WITH (NOLOCK) WHERE name = N'xml_index_type' AND OBJECT_ID(N'sys.xml_indexes') = object_id) THEN 1 ELSE 0 END AS SXI_PRESENT) carbon sa 0 5 0 0 1881496663 57 2017-08-04 14:13:07.513 2017-08-04 14:13:07.513 -SQL:BatchStarting SELECT ISNULL(SESSIONPROPERTY ('ANSI_NULLS'), 0), ISNULL(SESSIONPROPERTY ('QUOTED_IDENTIFIER'), 1) carbon sa 1881496663 57 2017-08-04 14:13:07.520 -SQL:BatchCompleted SELECT ISNULL(SESSIONPROPERTY ('ANSI_NULLS'), 0), ISNULL(SESSIONPROPERTY ('QUOTED_IDENTIFIER'), 1) carbon sa 0 0 0 0 1881496663 57 2017-08-04 14:13:07.520 2017-08-04 14:13:07.520 -SQL:BatchStarting SELECT SERVERPROPERTY('EngineEdition'), SERVERPROPERTY('productversion'), SERVERPROPERTY ('productlevel'), SERVERPROPERTY ('edition'), SERVERPROPERTY ('MachineName'), (SELECT CASE WHEN EXISTS (SELECT TOP 1 1 from [sys].[all_columns] WITH (NOLOCK) WHERE name = N'xml_index_type' AND OBJECT_ID(N'sys.xml_indexes') = object_id) THEN 1 ELSE 0 END AS SXI_PRESENT) carbon sa 1881496663 57 2017-08-04 14:13:07.523 -SQL:BatchCompleted SELECT SERVERPROPERTY('EngineEdition'), SERVERPROPERTY('productversion'), SERVERPROPERTY ('productlevel'), SERVERPROPERTY ('edition'), SERVERPROPERTY ('MachineName'), (SELECT CASE WHEN EXISTS (SELECT TOP 1 1 from [sys].[all_columns] WITH (NOLOCK) WHERE name = N'xml_index_type' AND OBJECT_ID(N'sys.xml_indexes') = object_id) THEN 1 ELSE 0 END AS SXI_PRESENT) carbon sa 0 5 0 0 1881496663 57 2017-08-04 14:13:07.523 2017-08-04 14:13:07.523 -SQL:BatchStarting SELECT ISNULL(SESSIONPROPERTY ('ANSI_NULLS'), 0), ISNULL(SESSIONPROPERTY ('QUOTED_IDENTIFIER'), 1) carbon sa 1881496663 57 2017-08-04 14:13:07.527 -SQL:BatchCompleted SELECT ISNULL(SESSIONPROPERTY ('ANSI_NULLS'), 0), ISNULL(SESSIONPROPERTY ('QUOTED_IDENTIFIER'), 1) carbon sa 0 0 0 0 1881496663 57 2017-08-04 14:13:07.527 2017-08-04 14:13:07.527 -SQL:BatchStarting SELECT CONVERT(NVARCHAR(36), CONTEXT_INFO()) carbon sa 1881496663 57 2017-08-04 14:13:07.530 -SQL:BatchCompleted SELECT CONVERT(NVARCHAR(36), CONTEXT_INFO()) carbon sa 0 0 0 0 1881496663 57 2017-08-04 14:13:07.530 2017-08-04 14:13:07.530 -SQL:BatchStarting set LOCK_TIMEOUT 5000 carbon sa 1881496663 57 2017-08-04 14:13:07.530 -SQL:BatchCompleted set LOCK_TIMEOUT 5000 carbon sa 0 0 0 0 1881496663 57 2017-08-04 14:13:07.530 2017-08-04 14:13:07.530 -SQL:BatchStarting SET ANSI_NULLS, ANSI_PADDING, ANSI_WARNINGS, ARITHABORT, CONCAT_NULL_YIELDS_NULL, QUOTED_IDENTIFIER ON; -SET NUMERIC_ROUNDABORT OFF; carbon sa 1881496663 57 2017-08-04 14:13:07.533 -SQL:BatchCompleted SET ANSI_NULLS, ANSI_PADDING, ANSI_WARNINGS, ARITHABORT, CONCAT_NULL_YIELDS_NULL, QUOTED_IDENTIFIER ON; -SET NUMERIC_ROUNDABORT OFF; carbon sa 0 0 0 0 1881496663 57 2017-08-04 14:13:07.533 2017-08-04 14:13:07.533 -SQL:BatchStarting SELECT SERVERPROPERTY('EngineEdition'), SERVERPROPERTY('productversion'), SERVERPROPERTY ('productlevel'), SERVERPROPERTY ('edition'), SERVERPROPERTY ('MachineName'), (SELECT CASE WHEN EXISTS (SELECT TOP 1 1 from [sys].[all_columns] WITH (NOLOCK) WHERE name = N'xml_index_type' AND OBJECT_ID(N'sys.xml_indexes') = object_id) THEN 1 ELSE 0 END AS SXI_PRESENT) carbon sa 1881496663 57 2017-08-04 14:13:07.537 -SQL:BatchCompleted SELECT SERVERPROPERTY('EngineEdition'), SERVERPROPERTY('productversion'), SERVERPROPERTY ('productlevel'), SERVERPROPERTY ('edition'), SERVERPROPERTY ('MachineName'), (SELECT CASE WHEN EXISTS (SELECT TOP 1 1 from [sys].[all_columns] WITH (NOLOCK) WHERE name = N'xml_index_type' AND OBJECT_ID(N'sys.xml_indexes') = object_id) THEN 1 ELSE 0 END AS SXI_PRESENT) carbon sa 0 5 0 0 1881496663 57 2017-08-04 14:13:07.537 2017-08-04 14:13:07.537 -SQL:BatchStarting SELECT OSVersion = RIGHT(@@version, LEN(@@version)- 3 -charindex (' ON ', @@version)) carbon sa 1881496663 57 2017-08-04 14:13:07.543 -SQL:BatchCompleted SELECT OSVersion = RIGHT(@@version, LEN(@@version)- 3 -charindex (' ON ', @@version)) carbon sa 0 0 0 0 1881496663 57 2017-08-04 14:13:07.543 2017-08-04 14:13:07.543 -SQL:BatchStarting DECLARE @edition sysname; SET @edition = cast(SERVERPROPERTY(N'EDITION') as sysname); select case when @edition = N'SQL Azure' then 2 else 1 end as 'DatabaseEngineType'; -SELECT SERVERPROPERTY('EngineEdition') AS DatabaseEngineEdition -select N'Windows' as host_platform - carbon sa 1881496663 57 2017-08-04 14:13:09.263 -SQL:BatchCompleted DECLARE @edition sysname; SET @edition = cast(SERVERPROPERTY(N'EDITION') as sysname); select case when @edition = N'SQL Azure' then 2 else 1 end as 'DatabaseEngineType'; -SELECT SERVERPROPERTY('EngineEdition') AS DatabaseEngineEdition -select N'Windows' as host_platform - carbon sa 0 0 0 0 1881496663 57 2017-08-04 14:13:09.263 2017-08-04 14:13:09.263 -SQL:BatchStarting use [master]; -if (db_id() = 1) -begin --- contained auth is 0 when connected to master -select 0 -end -else -begin --- need dynamic sql so that we compile this query only when we know resource db is available -exec('select case when authenticating_database_id = 1 then 0 else 1 end from -sys.dm_exec_sessions where session_id = @@SPID') -end;use [master]; --resetting the context carbon sa 1881496663 57 2017-08-04 14:13:09.270 -SQL:BatchCompleted use [master]; -if (db_id() = 1) -begin --- contained auth is 0 when connected to master -select 0 -end -else -begin --- need dynamic sql so that we compile this query only when we know resource db is available -exec('select case when authenticating_database_id = 1 then 0 else 1 end from -sys.dm_exec_sessions where session_id = @@SPID') -end;use [master]; --resetting the context carbon sa 0 0 0 0 1881496663 57 2017-08-04 14:13:09.270 2017-08-04 14:13:09.270 -RPC:Completed exec sp_executesql N'SELECT -dtb.collation_name AS [Collation], -dtb.name AS [DatabaseName2] -FROM -master.sys.databases AS dtb -WHERE -(dtb.name=@_msparam_0)',N'@_msparam_0 nvarchar(4000)',@_msparam_0=N'master' carbon sa 0 8 0 0 1881496663 57 2017-08-04 14:13:09.273 2017-08-04 14:13:09.273 0X00000000040000001A00730070005F006500780065006300750074006500730071006C002E01000082001A00E7206E0076006100720063006800610072002800310033003100290006010000530045004C004500430054000A006400740062002E0063006F006C006C006100740069006F006E005F006E0061006D00650020004100530020005B0043006F006C006C006100740069006F006E005D002C000A006400740062002E006E0061006D00650020004100530020005B00440061007400610062006100730065004E0061006D00650032005D000A00460052004F004D000A006D00610073007400650072002E007300790073002E006400610074006100 -SQL:BatchStarting select SERVERPROPERTY(N'servername') carbon sa 1881496663 57 2017-08-04 14:13:09.277 -SQL:BatchCompleted select SERVERPROPERTY(N'servername') carbon sa 0 0 0 0 1881496663 57 2017-08-04 14:13:09.277 2017-08-04 14:13:09.277 -RPC:Completed exec sp_executesql N'SELECT -dtb.name AS [Name] -FROM -master.sys.databases AS dtb -WHERE -((CAST(case when dtb.name in (''master'',''model'',''msdb'',''tempdb'') then 1 else dtb.is_distributor end AS bit)=@_msparam_0)) -ORDER BY -[Name] ASC',N'@_msparam_0 nvarchar(4000)',@_msparam_0=N'0' carbon sa 16 486 0 8 1881496663 57 2017-08-04 14:13:09.283 2017-08-04 14:13:09.290 0X00000000040000001A00730070005F006500780065006300750074006500730071006C00C201000082001A00E7206E007600610072006300680061007200280032003000350029009A010000530045004C004500430054000A006400740062002E006E0061006D00650020004100530020005B004E0061006D0065005D000A00460052004F004D000A006D00610073007400650072002E007300790073002E0064006100740061006200610073006500730020004100530020006400740062000A00570048004500520045000A002800280043004100530054002800630061007300650020007700680065006E0020006400740062002E006E0061006D006500 -Audit Logout carbon sa 16 509 0 892300 1881496663 57 2017-08-04 14:13:07.510 2017-08-04 14:27:59.810 -Audit Logout carbon sa 0 15 0 896027 1881496663 51 2017-08-04 14:13:03.783 2017-08-04 14:27:59.810 -Audit Logout carbon sa 16 187 0 895677 1881496663 56 2017-08-04 14:13:04.133 2017-08-04 14:27:59.810 -Audit Login -- network protocol: TCP/IP -set quoted_identifier on -set arithabort off -set numeric_roundabort off -set ansi_warnings on -set ansi_padding on -set ansi_nulls on -set concat_null_yields_null on -set cursor_close_on_commit off -set implicit_transactions off -set language us_english -set dateformat mdy -set datefirst 7 -set transaction isolation level read committed - carbon sa 1239302740 56 2017-08-04 14:30:06.520 -SQL:BatchStarting SELECT SERVERPROPERTY('EngineEdition'), SERVERPROPERTY('productversion'), SERVERPROPERTY ('productlevel'), SERVERPROPERTY ('edition'), SERVERPROPERTY ('MachineName'), (SELECT CASE WHEN EXISTS (SELECT TOP 1 1 from [sys].[all_columns] WITH (NOLOCK) WHERE name = N'xml_index_type' AND OBJECT_ID(N'sys.xml_indexes') = object_id) THEN 1 ELSE 0 END AS SXI_PRESENT) carbon sa 1239302740 56 2017-08-04 14:30:06.617 -SQL:BatchCompleted SELECT SERVERPROPERTY('EngineEdition'), SERVERPROPERTY('productversion'), SERVERPROPERTY ('productlevel'), SERVERPROPERTY ('edition'), SERVERPROPERTY ('MachineName'), (SELECT CASE WHEN EXISTS (SELECT TOP 1 1 from [sys].[all_columns] WITH (NOLOCK) WHERE name = N'xml_index_type' AND OBJECT_ID(N'sys.xml_indexes') = object_id) THEN 1 ELSE 0 END AS SXI_PRESENT) carbon sa 0 5 0 0 1239302740 56 2017-08-04 14:30:06.617 2017-08-04 14:30:06.617 -SQL:BatchStarting SELECT ISNULL(SESSIONPROPERTY ('ANSI_NULLS'), 0), ISNULL(SESSIONPROPERTY ('QUOTED_IDENTIFIER'), 1) carbon sa 1239302740 56 2017-08-04 14:30:06.670 -SQL:BatchCompleted SELECT ISNULL(SESSIONPROPERTY ('ANSI_NULLS'), 0), ISNULL(SESSIONPROPERTY ('QUOTED_IDENTIFIER'), 1) carbon sa 0 0 0 0 1239302740 56 2017-08-04 14:30:06.670 2017-08-04 14:30:06.670 -SQL:BatchStarting SELECT SERVERPROPERTY('EngineEdition'), SERVERPROPERTY('productversion'), SERVERPROPERTY ('productlevel'), SERVERPROPERTY ('edition'), SERVERPROPERTY ('MachineName'), (SELECT CASE WHEN EXISTS (SELECT TOP 1 1 from [sys].[all_columns] WITH (NOLOCK) WHERE name = N'xml_index_type' AND OBJECT_ID(N'sys.xml_indexes') = object_id) THEN 1 ELSE 0 END AS SXI_PRESENT) carbon sa 1239302740 56 2017-08-04 14:30:06.673 -SQL:BatchCompleted SELECT SERVERPROPERTY('EngineEdition'), SERVERPROPERTY('productversion'), SERVERPROPERTY ('productlevel'), SERVERPROPERTY ('edition'), SERVERPROPERTY ('MachineName'), (SELECT CASE WHEN EXISTS (SELECT TOP 1 1 from [sys].[all_columns] WITH (NOLOCK) WHERE name = N'xml_index_type' AND OBJECT_ID(N'sys.xml_indexes') = object_id) THEN 1 ELSE 0 END AS SXI_PRESENT) carbon sa 0 5 0 0 1239302740 56 2017-08-04 14:30:06.673 2017-08-04 14:30:06.673 -SQL:BatchStarting SELECT ISNULL(SESSIONPROPERTY ('ANSI_NULLS'), 0), ISNULL(SESSIONPROPERTY ('QUOTED_IDENTIFIER'), 1) carbon sa 1239302740 56 2017-08-04 14:30:06.677 -SQL:BatchCompleted SELECT ISNULL(SESSIONPROPERTY ('ANSI_NULLS'), 0), ISNULL(SESSIONPROPERTY ('QUOTED_IDENTIFIER'), 1) carbon sa 0 0 0 0 1239302740 56 2017-08-04 14:30:06.677 2017-08-04 14:30:06.677 -SQL:BatchStarting SELECT CONVERT(NVARCHAR(36), CONTEXT_INFO()) carbon sa 1239302740 56 2017-08-04 14:30:06.680 -SQL:BatchCompleted SELECT CONVERT(NVARCHAR(36), CONTEXT_INFO()) carbon sa 0 0 0 0 1239302740 56 2017-08-04 14:30:06.680 2017-08-04 14:30:06.680 -SQL:BatchStarting set LOCK_TIMEOUT 5000 carbon sa 1239302740 56 2017-08-04 14:30:06.693 -SQL:BatchCompleted set LOCK_TIMEOUT 5000 carbon sa 0 0 0 0 1239302740 56 2017-08-04 14:30:06.693 2017-08-04 14:30:06.693 -SQL:BatchStarting SET ANSI_NULLS, ANSI_PADDING, ANSI_WARNINGS, ARITHABORT, CONCAT_NULL_YIELDS_NULL, QUOTED_IDENTIFIER ON; -SET NUMERIC_ROUNDABORT OFF; carbon sa 1239302740 56 2017-08-04 14:30:06.700 -SQL:BatchCompleted SET ANSI_NULLS, ANSI_PADDING, ANSI_WARNINGS, ARITHABORT, CONCAT_NULL_YIELDS_NULL, QUOTED_IDENTIFIER ON; -SET NUMERIC_ROUNDABORT OFF; carbon sa 0 0 0 0 1239302740 56 2017-08-04 14:30:06.700 2017-08-04 14:30:06.700 -SQL:BatchStarting SELECT SERVERPROPERTY('EngineEdition'), SERVERPROPERTY('productversion'), SERVERPROPERTY ('productlevel'), SERVERPROPERTY ('edition'), SERVERPROPERTY ('MachineName'), (SELECT CASE WHEN EXISTS (SELECT TOP 1 1 from [sys].[all_columns] WITH (NOLOCK) WHERE name = N'xml_index_type' AND OBJECT_ID(N'sys.xml_indexes') = object_id) THEN 1 ELSE 0 END AS SXI_PRESENT) carbon sa 1239302740 56 2017-08-04 14:30:06.710 -SQL:BatchCompleted SELECT SERVERPROPERTY('EngineEdition'), SERVERPROPERTY('productversion'), SERVERPROPERTY ('productlevel'), SERVERPROPERTY ('edition'), SERVERPROPERTY ('MachineName'), (SELECT CASE WHEN EXISTS (SELECT TOP 1 1 from [sys].[all_columns] WITH (NOLOCK) WHERE name = N'xml_index_type' AND OBJECT_ID(N'sys.xml_indexes') = object_id) THEN 1 ELSE 0 END AS SXI_PRESENT) carbon sa 0 5 0 0 1239302740 56 2017-08-04 14:30:06.710 2017-08-04 14:30:06.710 -SQL:BatchStarting SELECT OSVersion = RIGHT(@@version, LEN(@@version)- 3 -charindex (' ON ', @@version)) carbon sa 1239302740 56 2017-08-04 14:30:06.713 -SQL:BatchCompleted SELECT OSVersion = RIGHT(@@version, LEN(@@version)- 3 -charindex (' ON ', @@version)) carbon sa 16 0 0 0 1239302740 56 2017-08-04 14:30:06.713 2017-08-04 14:30:06.713 -Audit Login -- network protocol: TCP/IP -set quoted_identifier on -set arithabort off -set numeric_roundabort off -set ansi_warnings on -set ansi_padding on -set ansi_nulls on -set concat_null_yields_null on -set cursor_close_on_commit off -set implicit_transactions off -set language us_english -set dateformat mdy -set datefirst 7 -set transaction isolation level read committed - carbon sa 1239302740 57 2017-08-04 14:30:06.780 -Audit Login -- network protocol: TCP/IP -set quoted_identifier on -set arithabort off -set numeric_roundabort off -set ansi_warnings on -set ansi_padding on -set ansi_nulls on -set concat_null_yields_null on -set cursor_close_on_commit off -set implicit_transactions off -set language us_english -set dateformat mdy -set datefirst 7 -set transaction isolation level read committed - carbon sa 1239302740 58 2017-08-04 14:30:06.823 -SQL:BatchStarting SELECT SERVERPROPERTY('EngineEdition'), SERVERPROPERTY('productversion'), SERVERPROPERTY ('productlevel'), SERVERPROPERTY ('edition'), SERVERPROPERTY ('MachineName'), (SELECT CASE WHEN EXISTS (SELECT TOP 1 1 from [sys].[all_columns] WITH (NOLOCK) WHERE name = N'xml_index_type' AND OBJECT_ID(N'sys.xml_indexes') = object_id) THEN 1 ELSE 0 END AS SXI_PRESENT) carbon sa 1239302740 58 2017-08-04 14:30:06.823 -SQL:BatchCompleted SELECT SERVERPROPERTY('EngineEdition'), SERVERPROPERTY('productversion'), SERVERPROPERTY ('productlevel'), SERVERPROPERTY ('edition'), SERVERPROPERTY ('MachineName'), (SELECT CASE WHEN EXISTS (SELECT TOP 1 1 from [sys].[all_columns] WITH (NOLOCK) WHERE name = N'xml_index_type' AND OBJECT_ID(N'sys.xml_indexes') = object_id) THEN 1 ELSE 0 END AS SXI_PRESENT) carbon sa 0 5 0 0 1239302740 58 2017-08-04 14:30:06.823 2017-08-04 14:30:06.823 -SQL:BatchStarting SELECT ISNULL(SESSIONPROPERTY ('ANSI_NULLS'), 0), ISNULL(SESSIONPROPERTY ('QUOTED_IDENTIFIER'), 1) carbon sa 1239302740 58 2017-08-04 14:30:06.827 -SQL:BatchCompleted SELECT ISNULL(SESSIONPROPERTY ('ANSI_NULLS'), 0), ISNULL(SESSIONPROPERTY ('QUOTED_IDENTIFIER'), 1) carbon sa 0 0 0 0 1239302740 58 2017-08-04 14:30:06.827 2017-08-04 14:30:06.827 -SQL:BatchStarting SELECT SERVERPROPERTY('EngineEdition'), SERVERPROPERTY('productversion'), SERVERPROPERTY ('productlevel'), SERVERPROPERTY ('edition'), SERVERPROPERTY ('MachineName'), (SELECT CASE WHEN EXISTS (SELECT TOP 1 1 from [sys].[all_columns] WITH (NOLOCK) WHERE name = N'xml_index_type' AND OBJECT_ID(N'sys.xml_indexes') = object_id) THEN 1 ELSE 0 END AS SXI_PRESENT) carbon sa 1239302740 58 2017-08-04 14:30:06.830 -SQL:BatchCompleted SELECT SERVERPROPERTY('EngineEdition'), SERVERPROPERTY('productversion'), SERVERPROPERTY ('productlevel'), SERVERPROPERTY ('edition'), SERVERPROPERTY ('MachineName'), (SELECT CASE WHEN EXISTS (SELECT TOP 1 1 from [sys].[all_columns] WITH (NOLOCK) WHERE name = N'xml_index_type' AND OBJECT_ID(N'sys.xml_indexes') = object_id) THEN 1 ELSE 0 END AS SXI_PRESENT) carbon sa 0 5 0 0 1239302740 58 2017-08-04 14:30:06.830 2017-08-04 14:30:06.830 -SQL:BatchStarting SELECT ISNULL(SESSIONPROPERTY ('ANSI_NULLS'), 0), ISNULL(SESSIONPROPERTY ('QUOTED_IDENTIFIER'), 1) carbon sa 1239302740 58 2017-08-04 14:30:06.833 -SQL:BatchCompleted SELECT ISNULL(SESSIONPROPERTY ('ANSI_NULLS'), 0), ISNULL(SESSIONPROPERTY ('QUOTED_IDENTIFIER'), 1) carbon sa 0 0 0 0 1239302740 58 2017-08-04 14:30:06.833 2017-08-04 14:30:06.833 -SQL:BatchStarting SELECT CONVERT(NVARCHAR(36), CONTEXT_INFO()) carbon sa 1239302740 58 2017-08-04 14:30:06.837 -SQL:BatchCompleted SELECT CONVERT(NVARCHAR(36), CONTEXT_INFO()) carbon sa 0 0 0 0 1239302740 58 2017-08-04 14:30:06.837 2017-08-04 14:30:06.837 -SQL:BatchStarting set LOCK_TIMEOUT 5000 carbon sa 1239302740 58 2017-08-04 14:30:06.840 -SQL:BatchCompleted set LOCK_TIMEOUT 5000 carbon sa 0 0 0 0 1239302740 58 2017-08-04 14:30:06.840 2017-08-04 14:30:06.840 -SQL:BatchStarting SET ANSI_NULLS, ANSI_PADDING, ANSI_WARNINGS, ARITHABORT, CONCAT_NULL_YIELDS_NULL, QUOTED_IDENTIFIER ON; -SET NUMERIC_ROUNDABORT OFF; carbon sa 1239302740 58 2017-08-04 14:30:06.843 -SQL:BatchCompleted SET ANSI_NULLS, ANSI_PADDING, ANSI_WARNINGS, ARITHABORT, CONCAT_NULL_YIELDS_NULL, QUOTED_IDENTIFIER ON; -SET NUMERIC_ROUNDABORT OFF; carbon sa 0 0 0 0 1239302740 58 2017-08-04 14:30:06.843 2017-08-04 14:30:06.843 -SQL:BatchStarting SELECT SERVERPROPERTY('EngineEdition'), SERVERPROPERTY('productversion'), SERVERPROPERTY ('productlevel'), SERVERPROPERTY ('edition'), SERVERPROPERTY ('MachineName'), (SELECT CASE WHEN EXISTS (SELECT TOP 1 1 from [sys].[all_columns] WITH (NOLOCK) WHERE name = N'xml_index_type' AND OBJECT_ID(N'sys.xml_indexes') = object_id) THEN 1 ELSE 0 END AS SXI_PRESENT) carbon sa 1239302740 58 2017-08-04 14:30:06.847 -SQL:BatchCompleted SELECT SERVERPROPERTY('EngineEdition'), SERVERPROPERTY('productversion'), SERVERPROPERTY ('productlevel'), SERVERPROPERTY ('edition'), SERVERPROPERTY ('MachineName'), (SELECT CASE WHEN EXISTS (SELECT TOP 1 1 from [sys].[all_columns] WITH (NOLOCK) WHERE name = N'xml_index_type' AND OBJECT_ID(N'sys.xml_indexes') = object_id) THEN 1 ELSE 0 END AS SXI_PRESENT) carbon sa 0 5 0 0 1239302740 58 2017-08-04 14:30:06.847 2017-08-04 14:30:06.847 -SQL:BatchStarting SELECT OSVersion = RIGHT(@@version, LEN(@@version)- 3 -charindex (' ON ', @@version)) carbon sa 1239302740 58 2017-08-04 14:30:06.847 -SQL:BatchCompleted SELECT OSVersion = RIGHT(@@version, LEN(@@version)- 3 -charindex (' ON ', @@version)) carbon sa 0 0 0 0 1239302740 58 2017-08-04 14:30:06.847 2017-08-04 14:30:06.847 -SQL:BatchStarting DECLARE @edition sysname; SET @edition = cast(SERVERPROPERTY(N'EDITION') as sysname); select case when @edition = N'SQL Azure' then 2 else 1 end as 'DatabaseEngineType'; -SELECT SERVERPROPERTY('EngineEdition') AS DatabaseEngineEdition -select N'Windows' as host_platform - carbon sa 1239302740 57 2017-08-04 14:30:07.210 -SQL:BatchCompleted DECLARE @edition sysname; SET @edition = cast(SERVERPROPERTY(N'EDITION') as sysname); select case when @edition = N'SQL Azure' then 2 else 1 end as 'DatabaseEngineType'; -SELECT SERVERPROPERTY('EngineEdition') AS DatabaseEngineEdition -select N'Windows' as host_platform - carbon sa 0 0 0 0 1239302740 57 2017-08-04 14:30:07.210 2017-08-04 14:30:07.210 -SQL:BatchStarting select SERVERPROPERTY(N'servername') carbon sa 1239302740 57 2017-08-04 14:30:07.357 -SQL:BatchCompleted select SERVERPROPERTY(N'servername') carbon sa 0 0 0 0 1239302740 57 2017-08-04 14:30:07.357 2017-08-04 14:30:07.357 -SQL:BatchStarting use [master]; -if (db_id() = 1) -begin --- contained auth is 0 when connected to master -select 0 -end -else -begin --- need dynamic sql so that we compile this query only when we know resource db is available -exec('select case when authenticating_database_id = 1 then 0 else 1 end from -sys.dm_exec_sessions where session_id = @@SPID') -end;use [master]; --resetting the context carbon sa 1239302740 57 2017-08-04 14:30:07.380 -SQL:BatchCompleted use [master]; -if (db_id() = 1) -begin --- contained auth is 0 when connected to master -select 0 -end -else -begin --- need dynamic sql so that we compile this query only when we know resource db is available -exec('select case when authenticating_database_id = 1 then 0 else 1 end from -sys.dm_exec_sessions where session_id = @@SPID') -end;use [master]; --resetting the context carbon sa 0 0 0 0 1239302740 57 2017-08-04 14:30:07.380 2017-08-04 14:30:07.380 -SQL:BatchStarting SELECT -CAST( - serverproperty(N'Servername') - AS sysname) AS [Name] carbon sa 1239302740 57 2017-08-04 14:30:07.560 -SQL:BatchCompleted SELECT -CAST( - serverproperty(N'Servername') - AS sysname) AS [Name] carbon sa 0 0 0 0 1239302740 57 2017-08-04 14:30:07.560 2017-08-04 14:30:07.560 -SQL:BatchStarting - declare @MasterPath nvarchar(512) - declare @LogPath nvarchar(512) - declare @ErrorLog nvarchar(512) - declare @ErrorLogPath nvarchar(512) - - select @MasterPath=substring(physical_name, 1, len(physical_name) - charindex('\', reverse(physical_name))) from master.sys.database_files where name=N'master' - select @LogPath=substring(physical_name, 1, len(physical_name) - charindex('\', reverse(physical_name))) from master.sys.database_files where name=N'mastlog' - select @ErrorLog=cast(SERVERPROPERTY(N'errorlogfilename') as nvarchar(512)) - select @ErrorLogPath=substring(@ErrorLog, 1, len(@ErrorLog) - charindex('\', reverse(@ErrorLog))) - - - - declare @SmoRoot nvarchar(512) - exec master.dbo.xp_instance_regread N'HKEY_LOCAL_MACHINE', N'SOFTWARE\Microsoft\MSSQLServer\Setup', N'SQLPath', @SmoRoot OUTPUT - - - -SELECT -CAST(case when 'a' <> 'A' then 1 else 0 end AS bit) AS [IsCaseSensitive], -@@MAX_PRECISION AS [MaxPrecision], -@ErrorLogPath AS [ErrorLogPath], -@SmoRoot AS [RootDirectory], -N'Windows' AS [HostPlatform], -N'\' AS [PathSeparator], -CAST(FULLTEXTSERVICEPROPERTY('IsFullTextInstalled') AS bit) AS [IsFullTextInstalled], -@LogPath AS [MasterDBLogPath], -@MasterPath AS [MasterDBPath], -SERVERPROPERTY(N'ProductVersion') AS [VersionString], -CAST(SERVERPROPERTY(N'Edition') AS sysname) AS [Edition], -CAST(SERVERPROPERTY(N'ProductLevel') AS sysname) AS [ProductLevel], -CAST(SERVERPROPERTY('IsSingleUser') AS bit) AS [IsSingleUser], -CAST(SERVERPROPERTY('EngineEdition') AS int) AS [EngineEdition], -convert(sysname, serverproperty(N'collation')) AS [Collation], -CAST(SERVERPROPERTY(N'MachineName') AS sysname) AS [NetName], -CAST(SERVERPROPERTY('IsClustered') AS bit) AS [IsClustered], -SERVERPROPERTY(N'ResourceVersion') AS [ResourceVersionString], -SERVERPROPERTY(N'ResourceLastUpdateDateTime') AS [ResourceLastUpdateDateTime], -SERVERPROPERTY(N'CollationID') AS [CollationID], -SERVERPROPERTY(N'ComparisonStyle') AS [ComparisonStyle], -SERVERPROPERTY(N'SqlCharSet') AS [SqlCharSet], -SERVERPROPERTY(N'SqlCharSetName') AS [SqlCharSetName], -SERVERPROPERTY(N'SqlSortOrder') AS [SqlSortOrder], -SERVERPROPERTY(N'SqlSortOrderName') AS [SqlSortOrderName], -SERVERPROPERTY(N'BuildClrVersion') AS [BuildClrVersionString], -SERVERPROPERTY(N'ComputerNamePhysicalNetBIOS') AS [ComputerNamePhysicalNetBIOS], -CAST(SERVERPROPERTY('IsPolyBaseInstalled') AS bit) AS [IsPolyBaseInstalled] carbon sa 1239302740 57 2017-08-04 14:30:07.630 -SQL:BatchCompleted - declare @MasterPath nvarchar(512) - declare @LogPath nvarchar(512) - declare @ErrorLog nvarchar(512) - declare @ErrorLogPath nvarchar(512) - - select @MasterPath=substring(physical_name, 1, len(physical_name) - charindex('\', reverse(physical_name))) from master.sys.database_files where name=N'master' - select @LogPath=substring(physical_name, 1, len(physical_name) - charindex('\', reverse(physical_name))) from master.sys.database_files where name=N'mastlog' - select @ErrorLog=cast(SERVERPROPERTY(N'errorlogfilename') as nvarchar(512)) - select @ErrorLogPath=substring(@ErrorLog, 1, len(@ErrorLog) - charindex('\', reverse(@ErrorLog))) - - - - declare @SmoRoot nvarchar(512) - exec master.dbo.xp_instance_regread N'HKEY_LOCAL_MACHINE', N'SOFTWARE\Microsoft\MSSQLServer\Setup', N'SQLPath', @SmoRoot OUTPUT - - - -SELECT -CAST(case when 'a' <> 'A' then 1 else 0 end AS bit) AS [IsCaseSensitive], -@@MAX_PRECISION AS [MaxPrecision], -@ErrorLogPath AS [ErrorLogPath], -@SmoRoot AS [RootDirectory], -N'Windows' AS [HostPlatform], -N'\' AS [PathSeparator], -CAST(FULLTEXTSERVICEPROPERTY('IsFullTextInstalled') AS bit) AS [IsFullTextInstalled], -@LogPath AS [MasterDBLogPath], -@MasterPath AS [MasterDBPath], -SERVERPROPERTY(N'ProductVersion') AS [VersionString], -CAST(SERVERPROPERTY(N'Edition') AS sysname) AS [Edition], -CAST(SERVERPROPERTY(N'ProductLevel') AS sysname) AS [ProductLevel], -CAST(SERVERPROPERTY('IsSingleUser') AS bit) AS [IsSingleUser], -CAST(SERVERPROPERTY('EngineEdition') AS int) AS [EngineEdition], -convert(sysname, serverproperty(N'collation')) AS [Collation], -CAST(SERVERPROPERTY(N'MachineName') AS sysname) AS [NetName], -CAST(SERVERPROPERTY('IsClustered') AS bit) AS [IsClustered], -SERVERPROPERTY(N'ResourceVersion') AS [ResourceVersionString], -SERVERPROPERTY(N'ResourceLastUpdateDateTime') AS [ResourceLastUpdateDateTime], -SERVERPROPERTY(N'CollationID') AS [CollationID], -SERVERPROPERTY(N'ComparisonStyle') AS [ComparisonStyle], -SERVERPROPERTY(N'SqlCharSet') AS [SqlCharSet], -SERVERPROPERTY(N'SqlCharSetName') AS [SqlCharSetName], -SERVERPROPERTY(N'SqlSortOrder') AS [SqlSortOrder], -SERVERPROPERTY(N'SqlSortOrderName') AS [SqlSortOrderName], -SERVERPROPERTY(N'BuildClrVersion') AS [BuildClrVersionString], -SERVERPROPERTY(N'ComputerNamePhysicalNetBIOS') AS [ComputerNamePhysicalNetBIOS], -CAST(SERVERPROPERTY('IsPolyBaseInstalled') AS bit) AS [IsPolyBaseInstalled] carbon sa 0 5 0 2 1239302740 57 2017-08-04 14:30:07.630 2017-08-04 14:30:07.633 -RPC:Completed exec sp_executesql N'SELECT -dtb.collation_name AS [Collation], -dtb.name AS [DatabaseName2] -FROM -master.sys.databases AS dtb -WHERE -(dtb.name=@_msparam_0)',N'@_msparam_0 nvarchar(4000)',@_msparam_0=N'master' carbon sa 0 8 0 0 1239302740 57 2017-08-04 14:30:07.797 2017-08-04 14:30:07.797 0X00000000040000001A00730070005F006500780065006300750074006500730071006C002E01000082001A00E7206E0076006100720063006800610072002800310033003100290006010000530045004C004500430054000A006400740062002E0063006F006C006C006100740069006F006E005F006E0061006D00650020004100530020005B0043006F006C006C006100740069006F006E005D002C000A006400740062002E006E0061006D00650020004100530020005B00440061007400610062006100730065004E0061006D00650032005D000A00460052004F004D000A006D00610073007400650072002E007300790073002E006400610074006100 -SQL:BatchStarting SELECT -dtb.name AS [Name], -dtb.database_id AS [ID], -CAST(case when dtb.name in ('master','model','msdb','tempdb') then 1 else dtb.is_distributor end AS bit) AS [IsSystemObject], -dtb.collation_name AS [Collation], -CAST(has_dbaccess(dtb.name) AS bit) AS [IsAccessible], -dtb.name AS [DatabaseName2] -FROM -master.sys.databases AS dtb -ORDER BY -[Name] ASC carbon sa 1239302740 57 2017-08-04 14:30:07.830 -SQL:BatchCompleted SELECT -dtb.name AS [Name], -dtb.database_id AS [ID], -CAST(case when dtb.name in ('master','model','msdb','tempdb') then 1 else dtb.is_distributor end AS bit) AS [IsSystemObject], -dtb.collation_name AS [Collation], -CAST(has_dbaccess(dtb.name) AS bit) AS [IsAccessible], -dtb.name AS [DatabaseName2] -FROM -master.sys.databases AS dtb -ORDER BY -[Name] ASC carbon sa 15 174 0 13 1239302740 57 2017-08-04 14:30:07.830 2017-08-04 14:30:07.843 -Audit Login -- network protocol: TCP/IP -set quoted_identifier on -set arithabort off -set numeric_roundabort off -set ansi_warnings on -set ansi_padding on -set ansi_nulls on -set concat_null_yields_null on -set cursor_close_on_commit off -set implicit_transactions off -set language us_english -set dateformat mdy -set datefirst 7 -set transaction isolation level read committed - Core .Net SqlClient Data Provider sa 1239302740 59 2017-08-04 14:30:11.543 -SQL:BatchStarting DECLARE @edition sysname; SET @edition = cast(SERVERPROPERTY(N'EDITION') as sysname); select case when @edition = N'SQL Azure' then 2 else 1 end as 'DatabaseEngineType'; -SELECT SERVERPROPERTY('EngineEdition') AS DatabaseEngineEdition -select N'Windows' as host_platform - Core .Net SqlClient Data Provider sa 1239302740 59 2017-08-04 14:30:11.547 -SQL:BatchCompleted DECLARE @edition sysname; SET @edition = cast(SERVERPROPERTY(N'EDITION') as sysname); select case when @edition = N'SQL Azure' then 2 else 1 end as 'DatabaseEngineType'; -SELECT SERVERPROPERTY('EngineEdition') AS DatabaseEngineEdition -select N'Windows' as host_platform - Core .Net SqlClient Data Provider sa 0 0 0 0 1239302740 59 2017-08-04 14:30:11.547 2017-08-04 14:30:11.547 -SQL:BatchStarting select SERVERPROPERTY(N'servername') Core .Net SqlClient Data Provider sa 1239302740 59 2017-08-04 14:30:11.560 -SQL:BatchCompleted select SERVERPROPERTY(N'servername') Core .Net SqlClient Data Provider sa 0 0 0 0 1239302740 59 2017-08-04 14:30:11.560 2017-08-04 14:30:11.560 -SQL:BatchStarting - declare @HkeyLocal nvarchar(18) - declare @ServicesRegPath nvarchar(34) - declare @SqlServiceRegPath sysname - declare @BrowserServiceRegPath sysname - declare @MSSqlServerRegPath nvarchar(31) - declare @InstanceNamesRegPath nvarchar(59) - declare @InstanceRegPath sysname - declare @SetupRegPath sysname - declare @NpRegPath sysname - declare @TcpRegPath sysname - declare @RegPathParams sysname - declare @FilestreamRegPath sysname - - select @HkeyLocal=N'HKEY_LOCAL_MACHINE' - - -- Instance-based paths - select @MSSqlServerRegPath=N'SOFTWARE\Microsoft\MSSQLServer' - select @InstanceRegPath=@MSSqlServerRegPath + N'\MSSQLServer' - select @FilestreamRegPath=@InstanceRegPath + N'\Filestream' - select @SetupRegPath=@MSSqlServerRegPath + N'\Setup' - select @RegPathParams=@InstanceRegPath+'\Parameters' - - -- Services - select @ServicesRegPath=N'SYSTEM\CurrentControlSet\Services' - select @SqlServiceRegPath=@ServicesRegPath + N'\MSSQLSERVER' - select @BrowserServiceRegPath=@ServicesRegPath + N'\SQLBrowser' - - -- InstanceId setting - select @InstanceNamesRegPath=N'SOFTWARE\Microsoft\Microsoft SQL Server\Instance Names\SQL' - - -- Network settings - select @NpRegPath=@InstanceRegPath + N'\SuperSocketNetLib\Np' - select @TcpRegPath=@InstanceRegPath + N'\SuperSocketNetLib\Tcp' - - - - declare @SmoAuditLevel int - exec master.dbo.xp_instance_regread @HkeyLocal, @InstanceRegPath, N'AuditLevel', @SmoAuditLevel OUTPUT - - - - declare @NumErrorLogs int - exec master.dbo.xp_instance_regread @HkeyLocal, @InstanceRegPath, N'NumErrorLogs', @NumErrorLogs OUTPUT - - - - declare @SmoLoginMode int - exec master.dbo.xp_instance_regread @HkeyLocal, @InstanceRegPath, N'LoginMode', @SmoLoginMode OUTPUT - - - - declare @SmoMailProfile nvarchar(512) - exec master.dbo.xp_instance_regread @HkeyLocal, @InstanceRegPath, N'MailAccountName', @SmoMailProfile OUTPUT - - - - declare @BackupDirectory nvarchar(512) - if 1=isnull(cast(SERVERPROPERTY('IsLocalDB') as bit), 0) - select @BackupDirectory=cast(SERVERPROPERTY('instancedefaultdatapath') as nvarchar(512)) - else - exec master.dbo.xp_instance_regread @HkeyLocal, @InstanceRegPath, N'BackupDirectory', @BackupDirectory OUTPUT - - - - declare @SmoPerfMonMode int - exec master.dbo.xp_instance_regread @HkeyLocal, @InstanceRegPath, N'Performance', @SmoPerfMonMode OUTPUT - - if @SmoPerfMonMode is null - begin - set @SmoPerfMonMode = 1000 - end - - - - declare @InstallSqlDataDir nvarchar(512) - exec master.dbo.xp_instance_regread @HkeyLocal, @SetupRegPath, N'SQLDataRoot', @InstallSqlDataDir OUTPUT - - - - declare @MasterPath nvarchar(512) - declare @LogPath nvarchar(512) - declare @ErrorLog nvarchar(512) - declare @ErrorLogPath nvarchar(512) - - select @MasterPath=substring(physical_name, 1, len(physical_name) - charindex('\', reverse(physical_name))) from master.sys.database_files where name=N'master' - select @LogPath=substring(physical_name, 1, len(physical_name) - charindex('\', reverse(physical_name))) from master.sys.database_files where name=N'mastlog' - select @ErrorLog=cast(SERVERPROPERTY(N'errorlogfilename') as nvarchar(512)) - select @ErrorLogPath=substring(@ErrorLog, 1, len(@ErrorLog) - charindex('\', reverse(@ErrorLog))) - - - - declare @SmoRoot nvarchar(512) - exec master.dbo.xp_instance_regread @HkeyLocal, @SetupRegPath, N'SQLPath', @SmoRoot OUTPUT - - - - declare @ServiceStartMode int - EXEC master.sys.xp_instance_regread @HkeyLocal, @SqlServiceRegPath, N'Start', @ServiceStartMode OUTPUT - - - - declare @ServiceAccount nvarchar(512) - EXEC master.sys.xp_instance_regread @HkeyLocal, @SqlServiceRegPath, N'ObjectName', @ServiceAccount OUTPUT - - - - declare @NamedPipesEnabled int - exec master.dbo.xp_instance_regread @HkeyLocal, @NpRegPath, N'Enabled', @NamedPipesEnabled OUTPUT - - - - declare @TcpEnabled int - EXEC master.sys.xp_instance_regread @HkeyLocal, @TcpRegPath, N'Enabled', @TcpEnabled OUTPUT - - - - declare @InstallSharedDirectory nvarchar(512) - EXEC master.sys.xp_instance_regread @HkeyLocal, @SetupRegPath, N'SQLPath', @InstallSharedDirectory OUTPUT - - - - declare @SqlGroup nvarchar(512) - exec master.dbo.xp_instance_regread @HkeyLocal, @SetupRegPath, N'SQLGroup', @SqlGroup OUTPUT - - - - declare @FilestreamLevel int - exec master.dbo.xp_instance_regread @HkeyLocal, @FilestreamRegPath, N'EnableLevel', @FilestreamLevel OUTPUT - - - - declare @FilestreamShareName nvarchar(512) - exec master.dbo.xp_instance_regread @HkeyLocal, @FilestreamRegPath, N'ShareName', @FilestreamShareName OUTPUT - - - - declare @cluster_name nvarchar(128) - declare @quorum_type tinyint - declare @quorum_state tinyint - BEGIN TRY - SELECT @cluster_name = cluster_name, - @quorum_type = quorum_type, - @quorum_state = quorum_state - FROM sys.dm_hadr_cluster - END TRY - BEGIN CATCH - --Querying this DMV using a contained auth connection throws error 15562 (Module is untrusted) - --because of lack of trustworthiness by the server. This is expected so we just leave the - --values as default - IF(ERROR_NUMBER() NOT IN (297,300, 15562)) - BEGIN - THROW - END - END CATCH - - -SELECT -@SmoAuditLevel AS [AuditLevel], -ISNULL(@NumErrorLogs, -1) AS [NumberOfLogFiles], -(case when @SmoLoginMode < 3 then @SmoLoginMode else 9 end) AS [LoginMode], -ISNULL(@SmoMailProfile,N'') AS [MailProfile], -@BackupDirectory AS [BackupDirectory], -@SmoPerfMonMode AS [PerfMonMode], -ISNULL(@InstallSqlDataDir,N'') AS [InstallDataDirectory], -CAST(@@SERVICENAME AS sysname) AS [ServiceName], -@ErrorLogPath AS [ErrorLogPath], -@SmoRoot AS [RootDirectory], -CAST(case when 'a' <> 'A' then 1 else 0 end AS bit) AS [IsCaseSensitive], -@@MAX_PRECISION AS [MaxPrecision], -CAST(FULLTEXTSERVICEPROPERTY('IsFullTextInstalled') AS bit) AS [IsFullTextInstalled], -SERVERPROPERTY(N'ProductVersion') AS [VersionString], -CAST(SERVERPROPERTY(N'Edition') AS sysname) AS [Edition], -CAST(SERVERPROPERTY(N'ProductLevel') AS sysname) AS [ProductLevel], -CAST(SERVERPROPERTY('IsSingleUser') AS bit) AS [IsSingleUser], -CAST(SERVERPROPERTY('EngineEdition') AS int) AS [EngineEdition], -convert(sysname, serverproperty(N'collation')) AS [Collation], -CAST(SERVERPROPERTY('IsClustered') AS bit) AS [IsClustered], -CAST(SERVERPROPERTY(N'MachineName') AS sysname) AS [NetName], -@LogPath AS [MasterDBLogPath], -@MasterPath AS [MasterDBPath], -SERVERPROPERTY('instancedefaultdatapath') AS [DefaultFile], -SERVERPROPERTY('instancedefaultlogpath') AS [DefaultLog], -SERVERPROPERTY(N'ResourceVersion') AS [ResourceVersionString], -SERVERPROPERTY(N'ResourceLastUpdateDateTime') AS [ResourceLastUpdateDateTime], -SERVERPROPERTY(N'CollationID') AS [CollationID], -SERVERPROPERTY(N'ComparisonStyle') AS [ComparisonStyle], -SERVERPROPERTY(N'SqlCharSet') AS [SqlCharSet], -SERVERPROPERTY(N'SqlCharSetName') AS [SqlCharSetName], -SERVERPROPERTY(N'SqlSortOrder') AS [SqlSortOrder], -SERVERPROPERTY(N'SqlSortOrderName') AS [SqlSortOrderName], -SERVERPROPERTY(N'ComputerNamePhysicalNetBIOS') AS [ComputerNamePhysicalNetBIOS], -SERVERPROPERTY(N'BuildClrVersion') AS [BuildClrVersionString], -@ServiceStartMode AS [ServiceStartMode], -ISNULL(@ServiceAccount,N'') AS [ServiceAccount], -CAST(@NamedPipesEnabled AS bit) AS [NamedPipesEnabled], -CAST(@TcpEnabled AS bit) AS [TcpEnabled], -ISNULL(@InstallSharedDirectory,N'') AS [InstallSharedDirectory], -ISNULL(suser_sname(sid_binary(ISNULL(@SqlGroup,N''))),N'') AS [SqlDomainGroup], -case when 1=msdb.dbo.fn_syspolicy_is_automation_enabled() and exists (select * from msdb.dbo.syspolicy_system_health_state where target_query_expression_with_id like 'Server%' ) then 1 else 0 end AS [PolicyHealthState], -@FilestreamLevel AS [FilestreamLevel], -ISNULL(@FilestreamShareName,N'') AS [FilestreamShareName], --1 AS [TapeLoadWaitTime], -CAST(SERVERPROPERTY(N'IsHadrEnabled') AS bit) AS [IsHadrEnabled], -SERVERPROPERTY(N'HADRManagerStatus') AS [HadrManagerStatus], -ISNULL(@cluster_name, '') AS [ClusterName], -ISNULL(@quorum_type, 4) AS [ClusterQuorumType], -ISNULL(@quorum_state, 3) AS [ClusterQuorumState], -SUSER_SID(@ServiceAccount, 0) AS [ServiceAccountSid], -CAST(SERVERPROPERTY('IsPolyBaseInstalled') AS bit) AS [IsPolyBaseInstalled], -N'Windows' AS [HostPlatform], -CAST( - serverproperty(N'Servername') - AS sysname) AS [Name], -CAST( - ISNULL(serverproperty(N'instancename'),N'') - AS sysname) AS [InstanceName], -CAST(0x0001 AS int) AS [Status], -N'\' AS [PathSeparator], -0 AS [IsContainedAuthentication], -CAST(null AS int) AS [ServerType] - - drop table #SVer - - Core .Net SqlClient Data Provider sa 1239302740 59 2017-08-04 14:30:11.577 -SQL:BatchCompleted - declare @HkeyLocal nvarchar(18) - declare @ServicesRegPath nvarchar(34) - declare @SqlServiceRegPath sysname - declare @BrowserServiceRegPath sysname - declare @MSSqlServerRegPath nvarchar(31) - declare @InstanceNamesRegPath nvarchar(59) - declare @InstanceRegPath sysname - declare @SetupRegPath sysname - declare @NpRegPath sysname - declare @TcpRegPath sysname - declare @RegPathParams sysname - declare @FilestreamRegPath sysname - - select @HkeyLocal=N'HKEY_LOCAL_MACHINE' - - -- Instance-based paths - select @MSSqlServerRegPath=N'SOFTWARE\Microsoft\MSSQLServer' - select @InstanceRegPath=@MSSqlServerRegPath + N'\MSSQLServer' - select @FilestreamRegPath=@InstanceRegPath + N'\Filestream' - select @SetupRegPath=@MSSqlServerRegPath + N'\Setup' - select @RegPathParams=@InstanceRegPath+'\Parameters' - - -- Services - select @ServicesRegPath=N'SYSTEM\CurrentControlSet\Services' - select @SqlServiceRegPath=@ServicesRegPath + N'\MSSQLSERVER' - select @BrowserServiceRegPath=@ServicesRegPath + N'\SQLBrowser' - - -- InstanceId setting - select @InstanceNamesRegPath=N'SOFTWARE\Microsoft\Microsoft SQL Server\Instance Names\SQL' - - -- Network settings - select @NpRegPath=@InstanceRegPath + N'\SuperSocketNetLib\Np' - select @TcpRegPath=@InstanceRegPath + N'\SuperSocketNetLib\Tcp' - - - - declare @SmoAuditLevel int - exec master.dbo.xp_instance_regread @HkeyLocal, @InstanceRegPath, N'AuditLevel', @SmoAuditLevel OUTPUT - - - - declare @NumErrorLogs int - exec master.dbo.xp_instance_regread @HkeyLocal, @InstanceRegPath, N'NumErrorLogs', @NumErrorLogs OUTPUT - - - - declare @SmoLoginMode int - exec master.dbo.xp_instance_regread @HkeyLocal, @InstanceRegPath, N'LoginMode', @SmoLoginMode OUTPUT - - - - declare @SmoMailProfile nvarchar(512) - exec master.dbo.xp_instance_regread @HkeyLocal, @InstanceRegPath, N'MailAccountName', @SmoMailProfile OUTPUT - - - - declare @BackupDirectory nvarchar(512) - if 1=isnull(cast(SERVERPROPERTY('IsLocalDB') as bit), 0) - select @BackupDirectory=cast(SERVERPROPERTY('instancedefaultdatapath') as nvarchar(512)) - else - exec master.dbo.xp_instance_regread @HkeyLocal, @InstanceRegPath, N'BackupDirectory', @BackupDirectory OUTPUT - - - - declare @SmoPerfMonMode int - exec master.dbo.xp_instance_regread @HkeyLocal, @InstanceRegPath, N'Performance', @SmoPerfMonMode OUTPUT - - if @SmoPerfMonMode is null - begin - set @SmoPerfMonMode = 1000 - end - - - - declare @InstallSqlDataDir nvarchar(512) - exec master.dbo.xp_instance_regread @HkeyLocal, @SetupRegPath, N'SQLDataRoot', @InstallSqlDataDir OUTPUT - - - - declare @MasterPath nvarchar(512) - declare @LogPath nvarchar(512) - declare @ErrorLog nvarchar(512) - declare @ErrorLogPath nvarchar(512) - - select @MasterPath=substring(physical_name, 1, len(physical_name) - charindex('\', reverse(physical_name))) from master.sys.database_files where name=N'master' - select @LogPath=substring(physical_name, 1, len(physical_name) - charindex('\', reverse(physical_name))) from master.sys.database_files where name=N'mastlog' - select @ErrorLog=cast(SERVERPROPERTY(N'errorlogfilename') as nvarchar(512)) - select @ErrorLogPath=substring(@ErrorLog, 1, len(@ErrorLog) - charindex('\', reverse(@ErrorLog))) - - - - declare @SmoRoot nvarchar(512) - exec master.dbo.xp_instance_regread @HkeyLocal, @SetupRegPath, N'SQLPath', @SmoRoot OUTPUT - - - - declare @ServiceStartMode int - EXEC master.sys.xp_instance_regread @HkeyLocal, @SqlServiceRegPath, N'Start', @ServiceStartMode OUTPUT - - - - declare @ServiceAccount nvarchar(512) - EXEC master.sys.xp_instance_regread @HkeyLocal, @SqlServiceRegPath, N'ObjectName', @ServiceAccount OUTPUT - - - - declare @NamedPipesEnabled int - exec master.dbo.xp_instance_regread @HkeyLocal, @NpRegPath, N'Enabled', @NamedPipesEnabled OUTPUT - - - - declare @TcpEnabled int - EXEC master.sys.xp_instance_regread @HkeyLocal, @TcpRegPath, N'Enabled', @TcpEnabled OUTPUT - - - - declare @InstallSharedDirectory nvarchar(512) - EXEC master.sys.xp_instance_regread @HkeyLocal, @SetupRegPath, N'SQLPath', @InstallSharedDirectory OUTPUT - - - - declare @SqlGroup nvarchar(512) - exec master.dbo.xp_instance_regread @HkeyLocal, @SetupRegPath, N'SQLGroup', @SqlGroup OUTPUT - - - - declare @FilestreamLevel int - exec master.dbo.xp_instance_regread @HkeyLocal, @FilestreamRegPath, N'EnableLevel', @FilestreamLevel OUTPUT - - - - declare @FilestreamShareName nvarchar(512) - exec master.dbo.xp_instance_regread @HkeyLocal, @FilestreamRegPath, N'ShareName', @FilestreamShareName OUTPUT - - - - declare @cluster_name nvarchar(128) - declare @quorum_type tinyint - declare @quorum_state tinyint - BEGIN TRY - SELECT @cluster_name = cluster_name, - @quorum_type = quorum_type, - @quorum_state = quorum_state - FROM sys.dm_hadr_cluster - END TRY - BEGIN CATCH - --Querying this DMV using a contained auth connection throws error 15562 (Module is untrusted) - --because of lack of trustworthiness by the server. This is expected so we just leave the - --values as default - IF(ERROR_NUMBER() NOT IN (297,300, 15562)) - BEGIN - THROW - END - END CATCH - - -SELECT -@SmoAuditLevel AS [AuditLevel], -ISNULL(@NumErrorLogs, -1) AS [NumberOfLogFiles], -(case when @SmoLoginMode < 3 then @SmoLoginMode else 9 end) AS [LoginMode], -ISNULL(@SmoMailProfile,N'') AS [MailProfile], -@BackupDirectory AS [BackupDirectory], -@SmoPerfMonMode AS [PerfMonMode], -ISNULL(@InstallSqlDataDir,N'') AS [InstallDataDirectory], -CAST(@@SERVICENAME AS sysname) AS [ServiceName], -@ErrorLogPath AS [ErrorLogPath], -@SmoRoot AS [RootDirectory], -CAST(case when 'a' <> 'A' then 1 else 0 end AS bit) AS [IsCaseSensitive], -@@MAX_PRECISION AS [MaxPrecision], -CAST(FULLTEXTSERVICEPROPERTY('IsFullTextInstalled') AS bit) AS [IsFullTextInstalled], -SERVERPROPERTY(N'ProductVersion') AS [VersionString], -CAST(SERVERPROPERTY(N'Edition') AS sysname) AS [Edition], -CAST(SERVERPROPERTY(N'ProductLevel') AS sysname) AS [ProductLevel], -CAST(SERVERPROPERTY('IsSingleUser') AS bit) AS [IsSingleUser], -CAST(SERVERPROPERTY('EngineEdition') AS int) AS [EngineEdition], -convert(sysname, serverproperty(N'collation')) AS [Collation], -CAST(SERVERPROPERTY('IsClustered') AS bit) AS [IsClustered], -CAST(SERVERPROPERTY(N'MachineName') AS sysname) AS [NetName], -@LogPath AS [MasterDBLogPath], -@MasterPath AS [MasterDBPath], -SERVERPROPERTY('instancedefaultdatapath') AS [DefaultFile], -SERVERPROPERTY('instancedefaultlogpath') AS [DefaultLog], -SERVERPROPERTY(N'ResourceVersion') AS [ResourceVersionString], -SERVERPROPERTY(N'ResourceLastUpdateDateTime') AS [ResourceLastUpdateDateTime], -SERVERPROPERTY(N'CollationID') AS [CollationID], -SERVERPROPERTY(N'ComparisonStyle') AS [ComparisonStyle], -SERVERPROPERTY(N'SqlCharSet') AS [SqlCharSet], -SERVERPROPERTY(N'SqlCharSetName') AS [SqlCharSetName], -SERVERPROPERTY(N'SqlSortOrder') AS [SqlSortOrder], -SERVERPROPERTY(N'SqlSortOrderName') AS [SqlSortOrderName], -SERVERPROPERTY(N'ComputerNamePhysicalNetBIOS') AS [ComputerNamePhysicalNetBIOS], -SERVERPROPERTY(N'BuildClrVersion') AS [BuildClrVersionString], -@ServiceStartMode AS [ServiceStartMode], -ISNULL(@ServiceAccount,N'') AS [ServiceAccount], -CAST(@NamedPipesEnabled AS bit) AS [NamedPipesEnabled], -CAST(@TcpEnabled AS bit) AS [TcpEnabled], -ISNULL(@InstallSharedDirectory,N'') AS [InstallSharedDirectory], -ISNULL(suser_sname(sid_binary(ISNULL(@SqlGroup,N''))),N'') AS [SqlDomainGroup], -case when 1=msdb.dbo.fn_syspolicy_is_automation_enabled() and exists (select * from msdb.dbo.syspolicy_system_health_state where target_query_expression_with_id like 'Server%' ) then 1 else 0 end AS [PolicyHealthState], -@FilestreamLevel AS [FilestreamLevel], -ISNULL(@FilestreamShareName,N'') AS [FilestreamShareName], --1 AS [TapeLoadWaitTime], -CAST(SERVERPROPERTY(N'IsHadrEnabled') AS bit) AS [IsHadrEnabled], -SERVERPROPERTY(N'HADRManagerStatus') AS [HadrManagerStatus], -ISNULL(@cluster_name, '') AS [ClusterName], -ISNULL(@quorum_type, 4) AS [ClusterQuorumType], -ISNULL(@quorum_state, 3) AS [ClusterQuorumState], -SUSER_SID(@ServiceAccount, 0) AS [ServiceAccountSid], -CAST(SERVERPROPERTY('IsPolyBaseInstalled') AS bit) AS [IsPolyBaseInstalled], -N'Windows' AS [HostPlatform], -CAST( - serverproperty(N'Servername') - AS sysname) AS [Name], -CAST( - ISNULL(serverproperty(N'instancename'),N'') - AS sysname) AS [InstanceName], -CAST(0x0001 AS int) AS [Status], -N'\' AS [PathSeparator], -0 AS [IsContainedAuthentication], -CAST(null AS int) AS [ServerType] - - drop table #SVer - - Core .Net SqlClient Data Provider sa 16 9 0 15 1239302740 59 2017-08-04 14:30:11.577 2017-08-04 14:30:11.593 -SQL:BatchStarting SELECT -cfg.name AS [Name], -cfg.configuration_id AS [Number], -cfg.minimum AS [Minimum], -cfg.maximum AS [Maximum], -cfg.is_dynamic AS [Dynamic], -cfg.is_advanced AS [Advanced], -cfg.value AS [ConfigValue], -cfg.value_in_use AS [RunValue], -cfg.description AS [Description] -FROM -sys.configurations AS cfg Core .Net SqlClient Data Provider sa 1239302740 59 2017-08-04 14:30:11.610 -SQL:BatchCompleted SELECT -cfg.name AS [Name], -cfg.configuration_id AS [Number], -cfg.minimum AS [Minimum], -cfg.maximum AS [Maximum], -cfg.is_dynamic AS [Dynamic], -cfg.is_advanced AS [Advanced], -cfg.value AS [ConfigValue], -cfg.value_in_use AS [RunValue], -cfg.description AS [Description] -FROM -sys.configurations AS cfg Core .Net SqlClient Data Provider sa 0 4 0 0 1239302740 59 2017-08-04 14:30:11.610 2017-08-04 14:30:11.610 -RPC:Completed exec sp_executesql N'SELECT -dtb.name AS [Name] -FROM -master.sys.databases AS dtb -WHERE -(dtb.name=@_msparam_0)',N'@_msparam_0 nvarchar(4000)',@_msparam_0=N'master' Core .Net SqlClient Data Provider sa 0 8 0 0 1239302740 59 2017-08-04 14:30:11.620 2017-08-04 14:30:11.620 0X00000000040000001A00730070005F006500780065006300750074006500730071006C00D400000082001800E7206E0076006100720063006800610072002800380037002900AE000000530045004C004500430054000A006400740062002E006E0061006D00650020004100530020005B004E0061006D0065005D000A00460052004F004D000A006D00610073007400650072002E007300790073002E0064006100740061006200610073006500730020004100530020006400740062000A00570048004500520045000A0028006400740062002E006E0061006D0065003D0040005F006D00730070006100720061006D005F00300029005A00000082001800 -RPC:Completed exec sp_executesql N'SELECT -dtb.compatibility_level AS [CompatibilityLevel], -dtb.name AS [DatabaseName2] -FROM -master.sys.databases AS dtb -WHERE -(dtb.name=@_msparam_0)',N'@_msparam_0 nvarchar(4000)',@_msparam_0=N'master' Core .Net SqlClient Data Provider sa 0 10 0 0 1239302740 59 2017-08-04 14:30:11.643 2017-08-04 14:30:11.643 0X00000000040000001A00730070005F006500780065006300750074006500730071006C004A01000082001A00E7206E0076006100720063006800610072002800310034003500290022010000530045004C004500430054000A006400740062002E0063006F006D007000610074006900620069006C006900740079005F006C006500760065006C0020004100530020005B0043006F006D007000610074006900620069006C006900740079004C006500760065006C005D002C000A006400740062002E006E0061006D00650020004100530020005B00440061007400610062006100730065004E0061006D00650032005D000A00460052004F004D000A006D00 -RPC:Completed exec sp_executesql N'SELECT -ISNULL((case dmi.mirroring_redo_queue_type when N''UNLIMITED'' then 0 else dmi.mirroring_redo_queue end),0) AS [MirroringRedoQueueMaxSize], -ISNULL(dmi.mirroring_connection_timeout,0) AS [MirroringTimeout], -ISNULL(dmi.mirroring_partner_name,'''') AS [MirroringPartner], -ISNULL(dmi.mirroring_partner_instance,'''') AS [MirroringPartnerInstance], -ISNULL(dmi.mirroring_role,0) AS [MirroringRole], -ISNULL(dmi.mirroring_safety_level + 1, 0) AS [MirroringSafetyLevel], -ISNULL(dmi.mirroring_state + 1, 0) AS [MirroringStatus], -ISNULL(dmi.mirroring_witness_name,'''') AS [MirroringWitness], -ISNULL(dmi.mirroring_witness_state + 1, 0) AS [MirroringWitnessStatus], -CAST(case when dmi.mirroring_partner_name is null then 0 else 1 end AS bit) AS [IsMirroringEnabled], -ISNULL(dmi.mirroring_guid,''00000000-0000-0000-0000-0000000000000000'') AS [MirroringID], -ISNULL(dmi.mirroring_role_sequence,0) AS [MirroringRoleSequence], -ISNULL(dmi.mirroring_safety_sequence,0) AS [MirroringSafetySequence], -ISNULL(dmi.mirroring_failover_lsn,0) AS [MirroringFailoverLogSequenceNumber], -dtb.is_ansi_null_default_on AS [AnsiNullDefault], -dtb.is_ansi_nulls_on AS [AnsiNullsEnabled], -dtb.is_ansi_padding_on AS [AnsiPaddingEnabled], -dtb.is_ansi_warnings_on AS [AnsiWarningsEnabled], -dtb.is_arithabort_on AS [ArithmeticAbortEnabled], -dtb.is_auto_shrink_on AS [AutoShrink], -dtb.is_cursor_close_on_commit_on AS [CloseCursorsOnCommitEnabled], -dtb.is_concat_null_yields_null_on AS [ConcatenateNullYieldsNull], -dtb.is_numeric_roundabort_on AS [NumericRoundAbortEnabled], -dtb.is_quoted_identifier_on AS [QuotedIdentifiersEnabled], -dtb.is_read_only AS [ReadOnly], -dtb.is_recursive_triggers_on AS [RecursiveTriggersEnabled], -dtb.user_access AS [UserAccess], -dtb.is_db_chaining_on AS [DatabaseOwnershipChaining], -dtb.is_auto_update_stats_async_on AS [AutoUpdateStatisticsAsync], -dtb.is_date_correlation_on AS [DateCorrelationOptimization], -dtb.is_trustworthy_on AS [Trustworthy], -dtb.name AS [Name], -dtb.database_id AS [ID], -dtb.create_date AS [CreateDate], -dtb.is_auto_create_stats_on AS [AutoCreateStatisticsEnabled], -dtb.is_auto_update_stats_on AS [AutoUpdateStatisticsEnabled], -dtb.is_parameterization_forced AS [IsParameterizationForced], -dtb.is_read_committed_snapshot_on AS [IsReadCommittedSnapshotOn], -CAST(isnull(dtb.source_database_id, 0) AS bit) AS [IsDatabaseSnapshot], -ISNULL(DB_NAME(dtb.source_database_id), N'''') AS [DatabaseSnapshotBaseName], -dtb.is_fulltext_enabled AS [IsFullTextEnabled], -dtb.service_broker_guid AS [ServiceBrokerGuid], -dtb.snapshot_isolation_state AS [SnapshotIsolationState], -(dtb.is_published*1+dtb.is_subscribed*2+dtb.is_merge_published*4) AS [ReplicationOptions], -dtb.is_local_cursor_default AS [LocalCursorsDefault], -dtb.page_verify_option AS [PageVerify], -dtb.recovery_model AS [RecoveryModel], -dtb.is_auto_close_on AS [AutoClose], -dtb.is_broker_enabled AS [BrokerEnabled], -ISNULL(suser_sname(dtb.owner_sid),'''') AS [Owner], -ISNULL(dtb.log_reuse_wait,0) AS [LogReuseWaitStatus], -drs.recovery_fork_guid AS [RecoveryForkGuid], -drs.database_guid AS [DatabaseGuid], -CAST((case when drs.last_log_backup_lsn is not null then 1 else 0 end) AS bit) AS [HasFullBackup], -CAST(case when dtb.name in (''master'',''model'',''msdb'',''tempdb'') then 1 else dtb.is_distributor end AS bit) AS [IsSystemObject], -CAST(case when ctb.database_id is null then 0 else 1 end AS bit) AS [ChangeTrackingEnabled], -CAST(ISNULL(ctb.is_auto_cleanup_on,0) AS bit) AS [ChangeTrackingAutoCleanUp], -ISNULL(ctb.retention_period,0) AS [ChangeTrackingRetentionPeriod], -CAST(ISNULL(ctb.retention_period_units,0) AS tinyint) AS [ChangeTrackingRetentionPeriodUnits], -dtb.containment AS [ContainmentType], -dtb.default_language_lcid AS [DefaultLanguageLcid], -dtb.default_language_name AS [DefaultLanguageName], -dtb.default_fulltext_language_lcid AS [DefaultFullTextLanguageLcid], -ISNULL(dtb.default_fulltext_language_name,N'''') AS [DefaultFullTextLanguageName], -CAST(dtb.is_nested_triggers_on AS bit) AS [NestedTriggersEnabled], -CAST(dtb.is_transform_noise_words_on AS bit) AS [TransformNoiseWords], -dtb.two_digit_year_cutoff AS [TwoDigitYearCutoff], -dtb.target_recovery_time_in_seconds AS [TargetRecoveryTime], -dtb.delayed_durability AS [DelayedDurability], -dtb.is_auto_create_stats_incremental_on AS [AutoCreateIncrementalStatisticsEnabled], - - case - when dtb.collation_name is null then 0x200 - else 0 - end | - case - when 1 = dtb.is_in_standby then 0x40 - else 0 - end | - case dtb.state - when 1 then 0x2 - when 2 then 0x8 - when 3 then 0x4 - when 4 then 0x10 - when 5 then 0x100 - when 6 then 0x20 - else 1 - end - AS [Status], -CAST(( case LOWER(convert( nvarchar(128), DATABASEPROPERTYEX(dtb.name, ''Updateability''))) when ''read_write'' then 1 else 0 end) AS bit) AS [IsUpdateable], -CAST(dtb.is_encrypted AS bit) AS [EncryptionEnabled], -CAST(dtb.is_honor_broker_priority_on AS bit) AS [HonorBrokerPriority], -CAST( - case - when SERVERPROPERTY(''EngineEdition'') = 6 then cast(1 as bit) - else cast(0 as bit) - end - AS bit) AS [IsSqlDw], -CAST(has_dbaccess(dtb.name) AS bit) AS [IsAccessible], -ISNULL(fsopt.directory_name , N'''') AS [FilestreamDirectoryName], -ISNULL(fsopt.non_transacted_access , 0) AS [FilestreamNonTransactedAccess], -CAST(dtb.is_remote_data_archive_enabled AS bit) AS [RemoteDataArchiveEnabled], -NULL AS [RemoteDataArchiveEndpoint], -NULL AS [RemoteDataArchiveLinkedServer], -NULL AS [RemoteDatabaseName], -0 AS [RemoteDataArchiveUseFederatedServiceAccount], -NULL AS [RemoteDataArchiveCredential], -0 AS [MaxDop], -NULL AS [MaxDopForSecondary], -0 AS [LegacyCardinalityEstimation], -2 AS [LegacyCardinalityEstimationForSecondary], -0 AS [ParameterSniffing], -2 AS [ParameterSniffingForSecondary], -0 AS [QueryOptimizerHotfixes], -2 AS [QueryOptimizerHotfixesForSecondary], -dtb.name AS [DatabaseName2], -dtb.containment AS [ContainmentType2], -dtb.name AS [DatabaseName5], -dtb.name AS [DatabaseName6] -FROM -master.sys.databases AS dtb -LEFT OUTER JOIN sys.database_mirroring AS dmi ON dmi.database_id = dtb.database_id -LEFT OUTER JOIN sys.database_recovery_status AS drs ON drs.database_id = dtb.database_id -LEFT OUTER JOIN sys.change_tracking_databases AS ctb ON ctb.database_id = dtb.database_id -LEFT OUTER JOIN sys.database_filestream_options AS fsopt ON fsopt.database_id = dtb.database_id -WHERE -(dtb.name=@_msparam_0)',N'@_msparam_0 nvarchar(4000)',@_msparam_0=N'master' Core .Net SqlClient Data Provider sa 0 47 0 0 1239302740 59 2017-08-04 14:30:11.657 2017-08-04 14:30:11.657 0X00000000040000001A00730070005F006500780065006300750074006500730071006C002E32000082000A0063206E00740065007800740016320000530045004C004500430054000A00490053004E0055004C004C00280028006300610073006500200064006D0069002E006D006900720072006F00720069006E0067005F007200650064006F005F00710075006500750065005F00740079007000650020007700680065006E0020004E00270055004E004C0049004D004900540045004400270020007400680065006E0020003000200065006C0073006500200064006D0069002E006D006900720072006F00720069006E0067005F007200650064006F00 -SQL:BatchStarting select -case - when cfg.configuration_id = 124 -- configuration id for default language - then (select lcid from sys.syslanguages as sl where sl.langid = cfg.value_in_use) -- getting default language LCID from default language langid - else cfg.value_in_use -end as value, -case - when cfg.configuration_id = 124 -- configuration id for default language - then (select name collate catalog_default from sys.syslanguages as sl where sl.langid = cfg.value_in_use) -- getting default language name from default language langid - when cfg.configuration_id = 1126 -- configuration id for default fulltext language - then ISNULL((select name collate catalog_default from sys.fulltext_languages as fl where fl.lcid = cfg.value_in_use), N'') -- getting default fulltext language name from default fulltext language lcid - else null -end as name, -cfg.configuration_id as configuration_id -from sys.configurations as cfg -where cfg.configuration_id in (115, 124, 1126, 1127, 1555) -order by cfg.configuration_id asc Core .Net SqlClient Data Provider sa 1239302740 59 2017-08-04 14:30:11.673 -SQL:BatchCompleted select -case - when cfg.configuration_id = 124 -- configuration id for default language - then (select lcid from sys.syslanguages as sl where sl.langid = cfg.value_in_use) -- getting default language LCID from default language langid - else cfg.value_in_use -end as value, -case - when cfg.configuration_id = 124 -- configuration id for default language - then (select name collate catalog_default from sys.syslanguages as sl where sl.langid = cfg.value_in_use) -- getting default language name from default language langid - when cfg.configuration_id = 1126 -- configuration id for default fulltext language - then ISNULL((select name collate catalog_default from sys.fulltext_languages as fl where fl.lcid = cfg.value_in_use), N'') -- getting default fulltext language name from default fulltext language lcid - else null -end as name, -cfg.configuration_id as configuration_id -from sys.configurations as cfg -where cfg.configuration_id in (115, 124, 1126, 1127, 1555) -order by cfg.configuration_id asc Core .Net SqlClient Data Provider sa 0 0 0 0 1239302740 59 2017-08-04 14:30:11.673 2017-08-04 14:30:11.673 -SQL:BatchStarting SELECT CASE WHEN has_dbaccess(N'master') = 1 THEN 'true' ELSE 'false' END Core .Net SqlClient Data Provider sa 1239302740 59 2017-08-04 14:30:11.683 -SQL:BatchCompleted SELECT CASE WHEN has_dbaccess(N'master') = 1 THEN 'true' ELSE 'false' END Core .Net SqlClient Data Provider sa 0 0 0 0 1239302740 59 2017-08-04 14:30:11.683 2017-08-04 14:30:11.683 -RPC:Completed exec sp_executesql N'SELECT COLLATIONPROPERTY((select collation_name from sys.databases where name = ISNULL(@dbname, db_name())), ''LCID''), COLLATIONPROPERTY((select collation_name from sys.databases where name = ISNULL(@dbname, db_name())), ''ComparisonStyle'')',N'@dbname nvarchar(6)',@dbname=N'master' Core .Net SqlClient Data Provider sa 0 16 0 0 1239302740 59 2017-08-04 14:30:11.700 2017-08-04 14:30:11.700 0X00000000040000001A00730070005F006500780065006300750074006500730071006C000402000082001A00E7206E00760061007200630068006100720028003200330038002900DC010000530045004C00450043005400200043004F004C004C004100540049004F004E00500052004F005000450052005400590028002800730065006C00650063007400200063006F006C006C006100740069006F006E005F006E0061006D0065002000660072006F006D0020007300790073002E0064006100740061006200610073006500730020007700680065007200650020006E0061006D00650020003D002000490053004E0055004C004C002800400064006200 -Audit Login -- network protocol: TCP/IP -set quoted_identifier on -set arithabort off -set numeric_roundabort off -set ansi_warnings on -set ansi_padding on -set ansi_nulls on -set concat_null_yields_null on -set cursor_close_on_commit off -set implicit_transactions off -set language us_english -set dateformat mdy -set datefirst 7 -set transaction isolation level read committed - Core .Net SqlClient Data Provider sa 1239302740 60 2017-08-04 14:30:11.737 -SQL:BatchStarting SELECT -eds.location AS [RemoteDataArchiveEndpoint], -eds.name AS [RemoteDataArchiveLinkedServer], -rdad.remote_database_name AS [RemoteDatabaseName], -rdad.federated_service_account AS [RemoteDataArchiveUseFederatedServiceAccount], -case when rdad.federated_service_account = 1 then null else cred.name end AS [RemoteDataArchiveCredential] -FROM -sys.remote_data_archive_databases rdad -INNER JOIN sys.external_data_sources eds ON rdad.data_source_id = eds.data_source_id -LEFT OUTER JOIN sys.database_scoped_credentials cred ON eds.credential_id = cred.credential_id Core .Net SqlClient Data Provider sa 1239302740 60 2017-08-04 14:30:11.737 -SQL:BatchCompleted SELECT -eds.location AS [RemoteDataArchiveEndpoint], -eds.name AS [RemoteDataArchiveLinkedServer], -rdad.remote_database_name AS [RemoteDatabaseName], -rdad.federated_service_account AS [RemoteDataArchiveUseFederatedServiceAccount], -case when rdad.federated_service_account = 1 then null else cred.name end AS [RemoteDataArchiveCredential] -FROM -sys.remote_data_archive_databases rdad -INNER JOIN sys.external_data_sources eds ON rdad.data_source_id = eds.data_source_id -LEFT OUTER JOIN sys.database_scoped_credentials cred ON eds.credential_id = cred.credential_id Core .Net SqlClient Data Provider sa 0 2 0 0 1239302740 60 2017-08-04 14:30:11.737 2017-08-04 14:30:11.737 -Audit Logout Core .Net SqlClient Data Provider sa 0 2 0 14 1239302740 60 2017-08-04 14:30:11.737 2017-08-04 14:30:11.750 -SQL:BatchStarting SELECT CASE WHEN has_dbaccess(N'master') = 1 THEN 'true' ELSE 'false' END Core .Net SqlClient Data Provider sa 1239302740 59 2017-08-04 14:30:11.763 -SQL:BatchCompleted SELECT CASE WHEN has_dbaccess(N'master') = 1 THEN 'true' ELSE 'false' END Core .Net SqlClient Data Provider sa 0 0 0 0 1239302740 59 2017-08-04 14:30:11.763 2017-08-04 14:30:11.763 -Audit Login -- network protocol: TCP/IP -set quoted_identifier on -set arithabort off -set numeric_roundabort off -set ansi_warnings on -set ansi_padding on -set ansi_nulls on -set concat_null_yields_null on -set cursor_close_on_commit off -set implicit_transactions off -set language us_english -set dateformat mdy -set datefirst 7 -set transaction isolation level read committed - Core .Net SqlClient Data Provider sa 1239302740 60 2017-08-04 14:30:11.807 -SQL:BatchStarting SELECT -(select value from sys.database_scoped_configurations as dsc where dsc.name = 'MAXDOP') AS [MaxDop], -(select value_for_secondary from sys.database_scoped_configurations as dsc where dsc.name = 'MAXDOP') AS [MaxDopForSecondary], -(select value from sys.database_scoped_configurations as dsc where dsc.name = 'LEGACY_CARDINALITY_ESTIMATION') AS [LegacyCardinalityEstimation], -(select ISNULL(value_for_secondary, 2) from sys.database_scoped_configurations as dsc where dsc.name = 'LEGACY_CARDINALITY_ESTIMATION') AS [LegacyCardinalityEstimationForSecondary], -(select value from sys.database_scoped_configurations as dsc where dsc.name = 'PARAMETER_SNIFFING') AS [ParameterSniffing], -(select ISNULL(value_for_secondary, 2) from sys.database_scoped_configurations as dsc where dsc.name = 'PARAMETER_SNIFFING') AS [ParameterSniffingForSecondary], -(select value from sys.database_scoped_configurations as dsc where dsc.name = 'QUERY_OPTIMIZER_HOTFIXES') AS [QueryOptimizerHotfixes], -(select ISNULL(value_for_secondary, 2) from sys.database_scoped_configurations as dsc where dsc.name = 'QUERY_OPTIMIZER_HOTFIXES') AS [QueryOptimizerHotfixesForSecondary] Core .Net SqlClient Data Provider sa 1239302740 60 2017-08-04 14:30:11.807 -SQL:BatchCompleted SELECT -(select value from sys.database_scoped_configurations as dsc where dsc.name = 'MAXDOP') AS [MaxDop], -(select value_for_secondary from sys.database_scoped_configurations as dsc where dsc.name = 'MAXDOP') AS [MaxDopForSecondary], -(select value from sys.database_scoped_configurations as dsc where dsc.name = 'LEGACY_CARDINALITY_ESTIMATION') AS [LegacyCardinalityEstimation], -(select ISNULL(value_for_secondary, 2) from sys.database_scoped_configurations as dsc where dsc.name = 'LEGACY_CARDINALITY_ESTIMATION') AS [LegacyCardinalityEstimationForSecondary], -(select value from sys.database_scoped_configurations as dsc where dsc.name = 'PARAMETER_SNIFFING') AS [ParameterSniffing], -(select ISNULL(value_for_secondary, 2) from sys.database_scoped_configurations as dsc where dsc.name = 'PARAMETER_SNIFFING') AS [ParameterSniffingForSecondary], -(select value from sys.database_scoped_configurations as dsc where dsc.name = 'QUERY_OPTIMIZER_HOTFIXES') AS [QueryOptimizerHotfixes], -(select ISNULL(value_for_secondary, 2) from sys.database_scoped_configurations as dsc where dsc.name = 'QUERY_OPTIMIZER_HOTFIXES') AS [QueryOptimizerHotfixesForSecondary] Core .Net SqlClient Data Provider sa 0 44 0 0 1239302740 60 2017-08-04 14:30:11.807 2017-08-04 14:30:11.807 -Audit Logout Core .Net SqlClient Data Provider sa 0 44 0 4 1239302740 60 2017-08-04 14:30:11.807 2017-08-04 14:30:11.810 -SQL:BatchStarting SELECT -(@@microsoftversion / 0x1000000) & 0xff AS [VersionMajor] Core .Net SqlClient Data Provider sa 1239302740 59 2017-08-04 14:30:11.820 -SQL:BatchCompleted SELECT -(@@microsoftversion / 0x1000000) & 0xff AS [VersionMajor] Core .Net SqlClient Data Provider sa 0 0 0 0 1239302740 59 2017-08-04 14:30:11.820 2017-08-04 14:30:11.820 -SQL:BatchStarting select is_srvrolemember('sysadmin') * 1 +is_srvrolemember('serveradmin') * 2 +is_srvrolemember('setupadmin') * 4 +is_srvrolemember('securityadmin') * 8 +is_srvrolemember('processadmin') * 16 +is_srvrolemember('dbcreator') * 32 +is_srvrolemember('diskadmin') * 64+ is_srvrolemember('bulkadmin') * 128 Core .Net SqlClient Data Provider sa 1239302740 59 2017-08-04 14:30:11.827 -SQL:BatchCompleted select is_srvrolemember('sysadmin') * 1 +is_srvrolemember('serveradmin') * 2 +is_srvrolemember('setupadmin') * 4 +is_srvrolemember('securityadmin') * 8 +is_srvrolemember('processadmin') * 16 +is_srvrolemember('dbcreator') * 32 +is_srvrolemember('diskadmin') * 64+ is_srvrolemember('bulkadmin') * 128 Core .Net SqlClient Data Provider sa 0 0 0 0 1239302740 59 2017-08-04 14:30:11.827 2017-08-04 14:30:11.827 -SQL:BatchStarting USE [master] Core .Net SqlClient Data Provider sa 1239302740 59 2017-08-04 14:30:11.837 -SQL:BatchCompleted USE [master] Core .Net SqlClient Data Provider sa 0 0 0 0 1239302740 59 2017-08-04 14:30:11.837 2017-08-04 14:30:11.837 -SQL:BatchStarting select suser_sname((select sid from sys.database_principals where name = N'dbo')); Core .Net SqlClient Data Provider sa 1239302740 59 2017-08-04 14:30:11.840 -SQL:BatchCompleted select suser_sname((select sid from sys.database_principals where name = N'dbo')); Core .Net SqlClient Data Provider sa 0 6 0 0 1239302740 59 2017-08-04 14:30:11.840 2017-08-04 14:30:11.840 -RPC:Completed exec sp_executesql N' - create table #tempbackup (database_name nvarchar(128), [type] char(1), backup_finish_date datetime) - insert into #tempbackup select database_name, [type], max(backup_finish_date) from msdb..backupset where [type] = ''D'' or [type] = ''L'' or [type]=''I'' group by database_name, [type] - - - -SELECT -(select backup_finish_date from #tempbackup where type = @_msparam_0 and db_id(database_name) = dtb.database_id) AS [LastBackupDate] -FROM -master.sys.databases AS dtb -WHERE -(dtb.name=@_msparam_1) - - drop table #tempbackup - -',N'@_msparam_0 nvarchar(4000),@_msparam_1 nvarchar(4000)',@_msparam_0=N'D',@_msparam_1=N'master' Core .Net SqlClient Data Provider sa 0 221 1 5 1239302740 59 2017-08-04 14:30:11.857 2017-08-04 14:30:11.863 0X00000000050000001A00730070005F006500780065006300750074006500730071006C006C04000082001A00E7206E00760061007200630068006100720028003500340036002900440400000A002000200020002000200020002000200063007200650061007400650020007400610062006C00650020002300740065006D0070006200610063006B007500700020002800640061007400610062006100730065005F006E0061006D00650020006E007600610072006300680061007200280031003200380029002C0020005B0074007900700065005D00200063006800610072002800310029002C0020006200610063006B00750070005F00660069006E00 -RPC:Completed exec sp_executesql N' - create table #tempbackup (database_name nvarchar(128), [type] char(1), backup_finish_date datetime) - insert into #tempbackup select database_name, [type], max(backup_finish_date) from msdb..backupset where [type] = ''D'' or [type] = ''L'' or [type]=''I'' group by database_name, [type] - - - -SELECT -(select backup_finish_date from #tempbackup where type = @_msparam_0 and db_id(database_name) = dtb.database_id) AS [LastLogBackupDate] -FROM -master.sys.databases AS dtb -WHERE -(dtb.name=@_msparam_1) - - drop table #tempbackup - -',N'@_msparam_0 nvarchar(4000),@_msparam_1 nvarchar(4000)',@_msparam_0=N'L',@_msparam_1=N'master' Core .Net SqlClient Data Provider sa 16 200 0 3 1239302740 59 2017-08-04 14:30:11.870 2017-08-04 14:30:11.873 0X00000000050000001A00730070005F006500780065006300750074006500730071006C007204000082001A00E7206E007600610072006300680061007200280035003400390029004A0400000A002000200020002000200020002000200063007200650061007400650020007400610062006C00650020002300740065006D0070006200610063006B007500700020002800640061007400610062006100730065005F006E0061006D00650020006E007600610072006300680061007200280031003200380029002C0020005B0074007900700065005D00200063006800610072002800310029002C0020006200610063006B00750070005F00660069006E00 -RPC:Completed exec sp_executesql N'SELECT -dtb.collation_name AS [Collation], -dtb.name AS [DatabaseName2] -FROM -master.sys.databases AS dtb -WHERE -(dtb.name=@_msparam_0)',N'@_msparam_0 nvarchar(4000)',@_msparam_0=N'master' Core .Net SqlClient Data Provider sa 0 8 0 0 1239302740 59 2017-08-04 14:30:11.883 2017-08-04 14:30:11.883 0X00000000040000001A00730070005F006500780065006300750074006500730071006C002E01000082001A00E7206E0076006100720063006800610072002800310033003100290006010000530045004C004500430054000A006400740062002E0063006F006C006C006100740069006F006E005F006E0061006D00650020004100530020005B0043006F006C006C006100740069006F006E005D002C000A006400740062002E006E0061006D00650020004100530020005B00440061007400610062006100730065004E0061006D00650032005D000A00460052004F004D000A006D00610073007400650072002E007300790073002E006400610074006100 -SQL:BatchStarting - declare @MasterPath nvarchar(512) - declare @LogPath nvarchar(512) - declare @ErrorLog nvarchar(512) - declare @ErrorLogPath nvarchar(512) - - select @MasterPath=substring(physical_name, 1, len(physical_name) - charindex('\', reverse(physical_name))) from master.sys.database_files where name=N'master' - select @LogPath=substring(physical_name, 1, len(physical_name) - charindex('\', reverse(physical_name))) from master.sys.database_files where name=N'mastlog' - select @ErrorLog=cast(SERVERPROPERTY(N'errorlogfilename') as nvarchar(512)) - select @ErrorLogPath=substring(@ErrorLog, 1, len(@ErrorLog) - charindex('\', reverse(@ErrorLog))) - - - - declare @SmoRoot nvarchar(512) - exec master.dbo.xp_instance_regread N'HKEY_LOCAL_MACHINE', N'SOFTWARE\Microsoft\MSSQLServer\Setup', N'SQLPath', @SmoRoot OUTPUT - - - -SELECT -CAST(case when 'a' <> 'A' then 1 else 0 end AS bit) AS [IsCaseSensitive], -@@MAX_PRECISION AS [MaxPrecision], -@ErrorLogPath AS [ErrorLogPath], -@SmoRoot AS [RootDirectory], -N'Windows' AS [HostPlatform], -N'\' AS [PathSeparator], -CAST(FULLTEXTSERVICEPROPERTY('IsFullTextInstalled') AS bit) AS [IsFullTextInstalled], -@LogPath AS [MasterDBLogPath], -@MasterPath AS [MasterDBPath], -SERVERPROPERTY(N'ProductVersion') AS [VersionString], -CAST(SERVERPROPERTY(N'Edition') AS sysname) AS [Edition], -CAST(SERVERPROPERTY(N'ProductLevel') AS sysname) AS [ProductLevel], -CAST(SERVERPROPERTY('IsSingleUser') AS bit) AS [IsSingleUser], -CAST(SERVERPROPERTY('EngineEdition') AS int) AS [EngineEdition], -convert(sysname, serverproperty(N'collation')) AS [Collation], -CAST(SERVERPROPERTY(N'MachineName') AS sysname) AS [NetName], -CAST(SERVERPROPERTY('IsClustered') AS bit) AS [IsClustered], -SERVERPROPERTY(N'ResourceVersion') AS [ResourceVersionString], -SERVERPROPERTY(N'ResourceLastUpdateDateTime') AS [ResourceLastUpdateDateTime], -SERVERPROPERTY(N'CollationID') AS [CollationID], -SERVERPROPERTY(N'ComparisonStyle') AS [ComparisonStyle], -SERVERPROPERTY(N'SqlCharSet') AS [SqlCharSet], -SERVERPROPERTY(N'SqlCharSetName') AS [SqlCharSetName], -SERVERPROPERTY(N'SqlSortOrder') AS [SqlSortOrder], -SERVERPROPERTY(N'SqlSortOrderName') AS [SqlSortOrderName], -SERVERPROPERTY(N'BuildClrVersion') AS [BuildClrVersionString], -SERVERPROPERTY(N'ComputerNamePhysicalNetBIOS') AS [ComputerNamePhysicalNetBIOS], -CAST(SERVERPROPERTY('IsPolyBaseInstalled') AS bit) AS [IsPolyBaseInstalled] Core .Net SqlClient Data Provider sa 1239302740 59 2017-08-04 14:30:11.900 -SQL:BatchCompleted - declare @MasterPath nvarchar(512) - declare @LogPath nvarchar(512) - declare @ErrorLog nvarchar(512) - declare @ErrorLogPath nvarchar(512) - - select @MasterPath=substring(physical_name, 1, len(physical_name) - charindex('\', reverse(physical_name))) from master.sys.database_files where name=N'master' - select @LogPath=substring(physical_name, 1, len(physical_name) - charindex('\', reverse(physical_name))) from master.sys.database_files where name=N'mastlog' - select @ErrorLog=cast(SERVERPROPERTY(N'errorlogfilename') as nvarchar(512)) - select @ErrorLogPath=substring(@ErrorLog, 1, len(@ErrorLog) - charindex('\', reverse(@ErrorLog))) - - - - declare @SmoRoot nvarchar(512) - exec master.dbo.xp_instance_regread N'HKEY_LOCAL_MACHINE', N'SOFTWARE\Microsoft\MSSQLServer\Setup', N'SQLPath', @SmoRoot OUTPUT - - - -SELECT -CAST(case when 'a' <> 'A' then 1 else 0 end AS bit) AS [IsCaseSensitive], -@@MAX_PRECISION AS [MaxPrecision], -@ErrorLogPath AS [ErrorLogPath], -@SmoRoot AS [RootDirectory], -N'Windows' AS [HostPlatform], -N'\' AS [PathSeparator], -CAST(FULLTEXTSERVICEPROPERTY('IsFullTextInstalled') AS bit) AS [IsFullTextInstalled], -@LogPath AS [MasterDBLogPath], -@MasterPath AS [MasterDBPath], -SERVERPROPERTY(N'ProductVersion') AS [VersionString], -CAST(SERVERPROPERTY(N'Edition') AS sysname) AS [Edition], -CAST(SERVERPROPERTY(N'ProductLevel') AS sysname) AS [ProductLevel], -CAST(SERVERPROPERTY('IsSingleUser') AS bit) AS [IsSingleUser], -CAST(SERVERPROPERTY('EngineEdition') AS int) AS [EngineEdition], -convert(sysname, serverproperty(N'collation')) AS [Collation], -CAST(SERVERPROPERTY(N'MachineName') AS sysname) AS [NetName], -CAST(SERVERPROPERTY('IsClustered') AS bit) AS [IsClustered], -SERVERPROPERTY(N'ResourceVersion') AS [ResourceVersionString], -SERVERPROPERTY(N'ResourceLastUpdateDateTime') AS [ResourceLastUpdateDateTime], -SERVERPROPERTY(N'CollationID') AS [CollationID], -SERVERPROPERTY(N'ComparisonStyle') AS [ComparisonStyle], -SERVERPROPERTY(N'SqlCharSet') AS [SqlCharSet], -SERVERPROPERTY(N'SqlCharSetName') AS [SqlCharSetName], -SERVERPROPERTY(N'SqlSortOrder') AS [SqlSortOrder], -SERVERPROPERTY(N'SqlSortOrderName') AS [SqlSortOrderName], -SERVERPROPERTY(N'BuildClrVersion') AS [BuildClrVersionString], -SERVERPROPERTY(N'ComputerNamePhysicalNetBIOS') AS [ComputerNamePhysicalNetBIOS], -CAST(SERVERPROPERTY('IsPolyBaseInstalled') AS bit) AS [IsPolyBaseInstalled] Core .Net SqlClient Data Provider sa 0 5 0 2 1239302740 59 2017-08-04 14:30:11.900 2017-08-04 14:30:11.903 -RPC:Completed exec sp_executesql N' - create table #tmp_sp_db_vardecimal_storage_format (dbname sysname null, vardecimal_enabled varchar(3) null) - if exists (select o.object_id from sys.system_objects o where o.name=N''sp_db_vardecimal_storage_format'') - begin - insert into #tmp_sp_db_vardecimal_storage_format exec sys.sp_db_vardecimal_storage_format - end - - - -SELECT - - case - when vardec.vardecimal_enabled = ''ON'' then cast(1 as bit) - else cast(0 as bit) - end - AS [IsVarDecimalStorageFormatEnabled] -FROM -master.sys.databases AS dtb -LEFT OUTER JOIN #tmp_sp_db_vardecimal_storage_format as vardec ON dtb.database_id = db_id(vardec.dbname) -WHERE -(dtb.name=@_msparam_0) - - drop table #tmp_sp_db_vardecimal_storage_format - -',N'@_msparam_0 nvarchar(4000)',@_msparam_0=N'master' Core .Net SqlClient Data Provider sa 15 469 2 6 1239302740 59 2017-08-04 14:30:11.913 2017-08-04 14:30:11.920 0X00000000040000001A00730070005F006500780065006300750074006500730071006C002406000082001A00E7206E00760061007200630068006100720028003700360036002900FC0500000A002000200020002000200020002000200063007200650061007400650020007400610062006C0065002000230074006D0070005F00730070005F00640062005F0076006100720064006500630069006D0061006C005F00730074006F0072006100670065005F0066006F0072006D006100740020002800640062006E0061006D00650020007300790073006E0061006D00650020006E0075006C006C002C00200076006100720064006500630069006D006100 -SQL:BatchStarting use [master] Core .Net SqlClient Data Provider sa 1239302740 59 2017-08-04 14:30:11.953 -SQL:BatchCompleted use [master] Core .Net SqlClient Data Provider sa 0 0 0 0 1239302740 59 2017-08-04 14:30:11.953 2017-08-04 14:30:11.953 -RPC:Completed exec sp_executesql N'SELECT -sp.name AS [Name] -FROM -sys.database_scoped_configurations AS sp -WHERE -(sp.name=@_msparam_0)',N'@_msparam_0 nvarchar(4000)',@_msparam_0=N'MAXDOP' Core .Net SqlClient Data Provider sa 0 8 0 0 1239302740 59 2017-08-04 14:30:11.957 2017-08-04 14:30:11.957 0X00000000040000001A00730070005F006500780065006300750074006500730071006C00EA00000082001800E7206E0076006100720063006800610072002800390038002900C4000000530045004C004500430054000A00730070002E006E0061006D00650020004100530020005B004E0061006D0065005D000A00460052004F004D000A007300790073002E00640061007400610062006100730065005F00730063006F007000650064005F0063006F006E00660069006700750072006100740069006F006E0073002000410053002000730070000A00570048004500520045000A002800730070002E006E0061006D0065003D0040005F006D0073007000 -SQL:BatchStarting use [master] Core .Net SqlClient Data Provider sa 1239302740 59 2017-08-04 14:30:11.967 -SQL:BatchCompleted use [master] Core .Net SqlClient Data Provider sa 0 0 0 0 1239302740 59 2017-08-04 14:30:11.967 2017-08-04 14:30:11.967 -RPC:Completed exec sp_executesql N'SELECT -sp.name AS [Name], -sp.configuration_id AS [Id], -CAST( - CASE - WHEN SQL_VARIANT_PROPERTY(value,''BaseType'') = ''bit'' THEN - CASE value - WHEN 1 THEN ''ON'' - WHEN 0 THEN ''OFF'' - END - ELSE ISNULL(value, ''NULL'') - END - AS nvarchar(200)) AS [Value], -CAST( - CASE - WHEN SQL_VARIANT_PROPERTY(value_for_secondary,''BaseType'') = ''bit'' THEN - CASE value_for_secondary - WHEN 1 THEN ''ON'' - WHEN 0 THEN ''OFF'' - END - ELSE ISNULL(value_for_secondary, ''PRIMARY'') - END - AS nvarchar(200)) AS [ValueForSecondary] -FROM -sys.database_scoped_configurations AS sp -WHERE -(sp.name=@_msparam_0)',N'@_msparam_0 nvarchar(4000)',@_msparam_0=N'MAXDOP' Core .Net SqlClient Data Provider sa 0 10 0 0 1239302740 59 2017-08-04 14:30:11.970 2017-08-04 14:30:11.970 0X00000000040000001A00730070005F006500780065006300750074006500730071006C009A05000082001A00E7206E0076006100720063006800610072002800360039003700290072050000530045004C004500430054000A00730070002E006E0061006D00650020004100530020005B004E0061006D0065005D002C000A00730070002E0063006F006E00660069006700750072006100740069006F006E005F006900640020004100530020005B00490064005D002C000A00430041005300540028000A0020002000200020002000200043004100530045000A00200020002000200020002000200020005700480045004E002000530051004C005F005600 -SQL:BatchStarting use [master] Core .Net SqlClient Data Provider sa 1239302740 59 2017-08-04 14:30:11.977 -SQL:BatchCompleted use [master] Core .Net SqlClient Data Provider sa 0 0 0 0 1239302740 59 2017-08-04 14:30:11.977 2017-08-04 14:30:11.977 -RPC:Completed exec sp_executesql N'SELECT -sp.name AS [Name] -FROM -sys.database_scoped_configurations AS sp -WHERE -(sp.name=@_msparam_0)',N'@_msparam_0 nvarchar(4000)',@_msparam_0=N'Legacy_Cardinality_Estimation' Core .Net SqlClient Data Provider sa 0 8 0 0 1239302740 59 2017-08-04 14:30:11.980 2017-08-04 14:30:11.980 0X00000000040000001A00730070005F006500780065006300750074006500730071006C00EA00000082001800E7206E0076006100720063006800610072002800390038002900C4000000530045004C004500430054000A00730070002E006E0061006D00650020004100530020005B004E0061006D0065005D000A00460052004F004D000A007300790073002E00640061007400610062006100730065005F00730063006F007000650064005F0063006F006E00660069006700750072006100740069006F006E0073002000410053002000730070000A00570048004500520045000A002800730070002E006E0061006D0065003D0040005F006D0073007000 -SQL:BatchStarting use [master] Core .Net SqlClient Data Provider sa 1239302740 59 2017-08-04 14:30:11.990 -SQL:BatchCompleted use [master] Core .Net SqlClient Data Provider sa 0 0 0 0 1239302740 59 2017-08-04 14:30:11.990 2017-08-04 14:30:11.990 -RPC:Completed exec sp_executesql N'SELECT -sp.name AS [Name], -sp.configuration_id AS [Id], -CAST( - CASE - WHEN SQL_VARIANT_PROPERTY(value,''BaseType'') = ''bit'' THEN - CASE value - WHEN 1 THEN ''ON'' - WHEN 0 THEN ''OFF'' - END - ELSE ISNULL(value, ''NULL'') - END - AS nvarchar(200)) AS [Value], -CAST( - CASE - WHEN SQL_VARIANT_PROPERTY(value_for_secondary,''BaseType'') = ''bit'' THEN - CASE value_for_secondary - WHEN 1 THEN ''ON'' - WHEN 0 THEN ''OFF'' - END - ELSE ISNULL(value_for_secondary, ''PRIMARY'') - END - AS nvarchar(200)) AS [ValueForSecondary] -FROM -sys.database_scoped_configurations AS sp -WHERE -(sp.name=@_msparam_0)',N'@_msparam_0 nvarchar(4000)',@_msparam_0=N'Legacy_Cardinality_Estimation' Core .Net SqlClient Data Provider sa 0 10 0 0 1239302740 59 2017-08-04 14:30:11.997 2017-08-04 14:30:11.997 0X00000000040000001A00730070005F006500780065006300750074006500730071006C009A05000082001A00E7206E0076006100720063006800610072002800360039003700290072050000530045004C004500430054000A00730070002E006E0061006D00650020004100530020005B004E0061006D0065005D002C000A00730070002E0063006F006E00660069006700750072006100740069006F006E005F006900640020004100530020005B00490064005D002C000A00430041005300540028000A0020002000200020002000200043004100530045000A00200020002000200020002000200020005700480045004E002000530051004C005F005600 -SQL:BatchStarting use [master] Core .Net SqlClient Data Provider sa 1239302740 59 2017-08-04 14:30:12.007 -SQL:BatchCompleted use [master] Core .Net SqlClient Data Provider sa 0 0 0 0 1239302740 59 2017-08-04 14:30:12.007 2017-08-04 14:30:12.007 -RPC:Completed exec sp_executesql N'SELECT -sp.name AS [Name] -FROM -sys.database_scoped_configurations AS sp -WHERE -(sp.name=@_msparam_0)',N'@_msparam_0 nvarchar(4000)',@_msparam_0=N'Parameter_Sniffing' Core .Net SqlClient Data Provider sa 0 8 0 0 1239302740 59 2017-08-04 14:30:12.010 2017-08-04 14:30:12.010 0X00000000040000001A00730070005F006500780065006300750074006500730071006C00EA00000082001800E7206E0076006100720063006800610072002800390038002900C4000000530045004C004500430054000A00730070002E006E0061006D00650020004100530020005B004E0061006D0065005D000A00460052004F004D000A007300790073002E00640061007400610062006100730065005F00730063006F007000650064005F0063006F006E00660069006700750072006100740069006F006E0073002000410053002000730070000A00570048004500520045000A002800730070002E006E0061006D0065003D0040005F006D0073007000 -SQL:BatchStarting use [master] Core .Net SqlClient Data Provider sa 1239302740 59 2017-08-04 14:30:12.017 -SQL:BatchCompleted use [master] Core .Net SqlClient Data Provider sa 0 0 0 0 1239302740 59 2017-08-04 14:30:12.017 2017-08-04 14:30:12.017 -RPC:Completed exec sp_executesql N'SELECT -sp.name AS [Name], -sp.configuration_id AS [Id], -CAST( - CASE - WHEN SQL_VARIANT_PROPERTY(value,''BaseType'') = ''bit'' THEN - CASE value - WHEN 1 THEN ''ON'' - WHEN 0 THEN ''OFF'' - END - ELSE ISNULL(value, ''NULL'') - END - AS nvarchar(200)) AS [Value], -CAST( - CASE - WHEN SQL_VARIANT_PROPERTY(value_for_secondary,''BaseType'') = ''bit'' THEN - CASE value_for_secondary - WHEN 1 THEN ''ON'' - WHEN 0 THEN ''OFF'' - END - ELSE ISNULL(value_for_secondary, ''PRIMARY'') - END - AS nvarchar(200)) AS [ValueForSecondary] -FROM -sys.database_scoped_configurations AS sp -WHERE -(sp.name=@_msparam_0)',N'@_msparam_0 nvarchar(4000)',@_msparam_0=N'Parameter_Sniffing' Core .Net SqlClient Data Provider sa 0 10 0 0 1239302740 59 2017-08-04 14:30:12.020 2017-08-04 14:30:12.020 0X00000000040000001A00730070005F006500780065006300750074006500730071006C009A05000082001A00E7206E0076006100720063006800610072002800360039003700290072050000530045004C004500430054000A00730070002E006E0061006D00650020004100530020005B004E0061006D0065005D002C000A00730070002E0063006F006E00660069006700750072006100740069006F006E005F006900640020004100530020005B00490064005D002C000A00430041005300540028000A0020002000200020002000200043004100530045000A00200020002000200020002000200020005700480045004E002000530051004C005F005600 -SQL:BatchStarting use [master] Core .Net SqlClient Data Provider sa 1239302740 59 2017-08-04 14:30:12.027 -SQL:BatchCompleted use [master] Core .Net SqlClient Data Provider sa 0 0 0 0 1239302740 59 2017-08-04 14:30:12.027 2017-08-04 14:30:12.027 -RPC:Completed exec sp_executesql N'SELECT -sp.name AS [Name] -FROM -sys.database_scoped_configurations AS sp -WHERE -(sp.name=@_msparam_0)',N'@_msparam_0 nvarchar(4000)',@_msparam_0=N'Query_Optimizer_Hotfixes' Core .Net SqlClient Data Provider sa 0 8 0 0 1239302740 59 2017-08-04 14:30:12.030 2017-08-04 14:30:12.030 0X00000000040000001A00730070005F006500780065006300750074006500730071006C00EA00000082001800E7206E0076006100720063006800610072002800390038002900C4000000530045004C004500430054000A00730070002E006E0061006D00650020004100530020005B004E0061006D0065005D000A00460052004F004D000A007300790073002E00640061007400610062006100730065005F00730063006F007000650064005F0063006F006E00660069006700750072006100740069006F006E0073002000410053002000730070000A00570048004500520045000A002800730070002E006E0061006D0065003D0040005F006D0073007000 -SQL:BatchStarting use [master] Core .Net SqlClient Data Provider sa 1239302740 59 2017-08-04 14:30:12.047 -SQL:BatchCompleted use [master] Core .Net SqlClient Data Provider sa 0 0 0 0 1239302740 59 2017-08-04 14:30:12.047 2017-08-04 14:30:12.047 -RPC:Completed exec sp_executesql N'SELECT -sp.name AS [Name], -sp.configuration_id AS [Id], -CAST( - CASE - WHEN SQL_VARIANT_PROPERTY(value,''BaseType'') = ''bit'' THEN - CASE value - WHEN 1 THEN ''ON'' - WHEN 0 THEN ''OFF'' - END - ELSE ISNULL(value, ''NULL'') - END - AS nvarchar(200)) AS [Value], -CAST( - CASE - WHEN SQL_VARIANT_PROPERTY(value_for_secondary,''BaseType'') = ''bit'' THEN - CASE value_for_secondary - WHEN 1 THEN ''ON'' - WHEN 0 THEN ''OFF'' - END - ELSE ISNULL(value_for_secondary, ''PRIMARY'') - END - AS nvarchar(200)) AS [ValueForSecondary] -FROM -sys.database_scoped_configurations AS sp -WHERE -(sp.name=@_msparam_0)',N'@_msparam_0 nvarchar(4000)',@_msparam_0=N'Query_Optimizer_Hotfixes' Core .Net SqlClient Data Provider sa 0 10 0 0 1239302740 59 2017-08-04 14:30:12.050 2017-08-04 14:30:12.050 0X00000000040000001A00730070005F006500780065006300750074006500730071006C009A05000082001A00E7206E0076006100720063006800610072002800360039003700290072050000530045004C004500430054000A00730070002E006E0061006D00650020004100530020005B004E0061006D0065005D002C000A00730070002E0063006F006E00660069006700750072006100740069006F006E005F006900640020004100530020005B00490064005D002C000A00430041005300540028000A0020002000200020002000200043004100530045000A00200020002000200020002000200020005700480045004E002000530051004C005F005600 -SQL:BatchStarting use [master] Core .Net SqlClient Data Provider sa 1239302740 59 2017-08-04 14:30:12.063 -SQL:BatchCompleted use [master] Core .Net SqlClient Data Provider sa 0 0 0 0 1239302740 59 2017-08-04 14:30:12.063 2017-08-04 14:30:12.063 -SQL:BatchStarting - DECLARE @is_policy_automation_enabled bit - SET @is_policy_automation_enabled = (SELECT CONVERT(bit, current_value) - FROM msdb.dbo.syspolicy_configuration - WHERE name = 'Enabled') - - - -SELECT -CAST(cast(g.name as varbinary(256)) AS sysname) AS [Name], -g.data_space_id AS [ID], -CAST(g.is_default AS bit) AS [IsDefault], -g.is_read_only AS [ReadOnly], -CAST(ISNULL((select sum(cast(gs.size as float))*convert(float,8) from sys.database_files gs where gs.data_space_id = g.data_space_id), 0) AS float) AS [Size], -CASE g.type WHEN 'FG' THEN 0 WHEN 'PS' THEN 1 WHEN 'FD' THEN 2 WHEN 'FX' THEN 3 END AS [FileGroupType], -CAST(CASE WHEN 'FD'=g.type THEN 1 ELSE 0 END AS bit) AS [IsFileStream], -case when 1=@is_policy_automation_enabled and exists (select * from msdb.dbo.syspolicy_system_health_state where target_query_expression_with_id like 'Server' + '/Database\[@ID=' + convert(nvarchar(20),dtb.database_id) + '\]'+ '/FileGroup\[@ID=' + convert(nvarchar(20),g.data_space_id) + '\]%' ESCAPE '\') then 1 else 0 end AS [PolicyHealthState] -FROM -master.sys.databases AS dtb, -sys.filegroups AS g -WHERE -(dtb.name=db_name()) -ORDER BY -[Name] ASC Core .Net SqlClient Data Provider sa 1239302740 59 2017-08-04 14:30:12.067 -SQL:BatchCompleted - DECLARE @is_policy_automation_enabled bit - SET @is_policy_automation_enabled = (SELECT CONVERT(bit, current_value) - FROM msdb.dbo.syspolicy_configuration - WHERE name = 'Enabled') - - - -SELECT -CAST(cast(g.name as varbinary(256)) AS sysname) AS [Name], -g.data_space_id AS [ID], -CAST(g.is_default AS bit) AS [IsDefault], -g.is_read_only AS [ReadOnly], -CAST(ISNULL((select sum(cast(gs.size as float))*convert(float,8) from sys.database_files gs where gs.data_space_id = g.data_space_id), 0) AS float) AS [Size], -CASE g.type WHEN 'FG' THEN 0 WHEN 'PS' THEN 1 WHEN 'FD' THEN 2 WHEN 'FX' THEN 3 END AS [FileGroupType], -CAST(CASE WHEN 'FD'=g.type THEN 1 ELSE 0 END AS bit) AS [IsFileStream], -case when 1=@is_policy_automation_enabled and exists (select * from msdb.dbo.syspolicy_system_health_state where target_query_expression_with_id like 'Server' + '/Database\[@ID=' + convert(nvarchar(20),dtb.database_id) + '\]'+ '/FileGroup\[@ID=' + convert(nvarchar(20),g.data_space_id) + '\]%' ESCAPE '\') then 1 else 0 end AS [PolicyHealthState] -FROM -master.sys.databases AS dtb, -sys.filegroups AS g -WHERE -(dtb.name=db_name()) -ORDER BY -[Name] ASC Core .Net SqlClient Data Provider sa 0 14 0 0 1239302740 59 2017-08-04 14:30:12.067 2017-08-04 14:30:12.067 -SQL:BatchStarting use [master] Core .Net SqlClient Data Provider sa 1239302740 59 2017-08-04 14:30:12.083 -SQL:BatchCompleted use [master] Core .Net SqlClient Data Provider sa 0 0 0 0 1239302740 59 2017-08-04 14:30:12.083 2017-08-04 14:30:12.083 -RPC:Completed exec sp_executesql N' with s as ( -select df.[type] as [type], -df.name collate database_default as name, -df.drop_lsn as drop_lsn, -dtb.database_id as database_id, -df.[file_id] as [file_id], -df.max_size as max_size, -df.growth as growth, -df.is_percent_growth as is_percent_growth, -df.is_media_read_only as is_media_read_only, -df.is_read_only as is_read_only, -df.[state] as [state], -df.is_sparse as is_sparse, -df.data_space_id as data_space_id, -df.physical_name collate database_default as physical_name, -df.size as size - from sys.database_files as df inner join sys.databases as dtb - on (db_id() = dtb.database_id) - and (df.type = 2 or df.type = 0) - and (df.drop_lsn is null) - where - (dtb.source_database_id is null) -union -select -mf.[type] as [type], -mf.name collate database_default as name, -mf.drop_lsn as drop_lsn, -mf.database_id as database_id, -mf.[file_id] as [file_id], -mf.max_size as max_size, -mf.growth as growth, -mf.is_percent_growth as is_percent_growth, -mf.is_media_read_only as is_media_read_only, -mf.is_read_only as is_read_only, -mf.[state] as [state], -mf.is_sparse as is_sparse, -mf.data_space_id as data_space_id, -mf.physical_name collate database_default as physical_name, -mf.size as size - from sys.master_files as mf inner join sys.databases as db - on (mf.database_id = db.database_id) - and (mf.type = 2 or mf.type = 0) - and (mf.drop_lsn is null) - and (db.source_database_id is not null) - where mf.database_id = db_id()) - - - -SELECT -s.name AS [Name], -CAST(CASE s.file_id WHEN 1 THEN 1 ELSE 0 END AS bit) AS [IsPrimaryFile], -CAST(CASE when s.growth=0 THEN (CASE WHEN s.type = 2 THEN 0 ELSE 99 END) ELSE s.is_percent_growth END AS int) AS [GrowthType], -s.physical_name AS [FileName], -s.size * CONVERT(float,8) AS [Size], -CASE when s.max_size=-1 then -1 else s.max_size * CONVERT(float,8) END AS [MaxSize], -s.file_id AS [ID], -''Server[@Name='' + quotename(CAST( - serverproperty(N''Servername'') - AS sysname),'''''''') + '']'' + ''/Database[@Name='' + quotename(db_name(),'''''''') + '']'' + ''/FileGroup[@Name='' + quotename(CAST(cast(g.name as varbinary(256)) AS sysname),'''''''') + '']'' + ''/File[@Name='' + quotename(s.name,'''''''') + '']'' AS [Urn], -CAST(CASE s.is_percent_growth WHEN 1 THEN s.growth ELSE s.growth*8 END AS float) AS [Growth], -s.is_media_read_only AS [IsReadOnlyMedia], -s.is_read_only AS [IsReadOnly], -CAST(case s.state when 6 then 1 else 0 end AS bit) AS [IsOffline], -s.is_sparse AS [IsSparse] -FROM -sys.filegroups AS g -INNER JOIN s ON s.data_space_id=g.data_space_id -WHERE -(CAST(cast(g.name as varbinary(256)) AS sysname)=@_msparam_0) -ORDER BY -[Name] ASC',N'@_msparam_0 nvarchar(4000)',@_msparam_0=N'PRIMARY' Core .Net SqlClient Data Provider sa 0 12 0 0 1239302740 59 2017-08-04 14:30:12.087 2017-08-04 14:30:12.087 0X00000000040000001A00730070005F006500780065006300750074006500730071006C001615000082001C00E7206E007600610072006300680061007200280032003600370038002900EC14000020002000770069007400680020007300200061007300200028000A00730065006C006500630074002000640066002E005B0074007900700065005D0020006100730020005B0074007900700065005D002C000A00640066002E006E0061006D006500200063006F006C006C006100740065002000640061007400610062006100730065005F00640065006600610075006C00740020006100730020006E0061006D0065002C000A00640066002E0064007200 -SQL:BatchStarting use [master] Core .Net SqlClient Data Provider sa 1239302740 59 2017-08-04 14:30:12.117 -SQL:BatchCompleted use [master] Core .Net SqlClient Data Provider sa 0 0 0 0 1239302740 59 2017-08-04 14:30:12.117 2017-08-04 14:30:12.117 -SQL:BatchStarting SELECT -s.name AS [Name], -CAST(FILEPROPERTY(s.name, 'SpaceUsed') AS float)* CONVERT(float,8) AS [UsedSpace], -CAST(CASE when s.growth=0 THEN (CASE WHEN s.type = 2 THEN 0 ELSE 99 END) ELSE s.is_percent_growth END AS int) AS [GrowthType], -s.physical_name AS [FileName], -s.size * CONVERT(float,8) AS [Size], -CASE when s.max_size=-1 then -1 else s.max_size * CONVERT(float,8) END AS [MaxSize], -s.file_id AS [ID], -'Server[@Name=' + quotename(CAST( - serverproperty(N'Servername') - AS sysname),'''') + ']' + '/Database[@Name=' + quotename(db_name(),'''') + ']' + '/LogFile[@Name=' + quotename(s.name,'''') + ']' AS [Urn], -CAST(CASE s.is_percent_growth WHEN 1 THEN s.growth ELSE s.growth*8 END AS float) AS [Growth], -s.is_media_read_only AS [IsReadOnlyMedia], -s.is_read_only AS [IsReadOnly], -CAST(case s.state when 6 then 1 else 0 end AS bit) AS [IsOffline], -s.is_sparse AS [IsSparse] -FROM -sys.database_files AS s -WHERE -(s.type = 1) -ORDER BY -[Name] ASC Core .Net SqlClient Data Provider sa 1239302740 59 2017-08-04 14:30:12.120 -SQL:BatchCompleted SELECT -s.name AS [Name], -CAST(FILEPROPERTY(s.name, 'SpaceUsed') AS float)* CONVERT(float,8) AS [UsedSpace], -CAST(CASE when s.growth=0 THEN (CASE WHEN s.type = 2 THEN 0 ELSE 99 END) ELSE s.is_percent_growth END AS int) AS [GrowthType], -s.physical_name AS [FileName], -s.size * CONVERT(float,8) AS [Size], -CASE when s.max_size=-1 then -1 else s.max_size * CONVERT(float,8) END AS [MaxSize], -s.file_id AS [ID], -'Server[@Name=' + quotename(CAST( - serverproperty(N'Servername') - AS sysname),'''') + ']' + '/Database[@Name=' + quotename(db_name(),'''') + ']' + '/LogFile[@Name=' + quotename(s.name,'''') + ']' AS [Urn], -CAST(CASE s.is_percent_growth WHEN 1 THEN s.growth ELSE s.growth*8 END AS float) AS [Growth], -s.is_media_read_only AS [IsReadOnlyMedia], -s.is_read_only AS [IsReadOnly], -CAST(case s.state when 6 then 1 else 0 end AS bit) AS [IsOffline], -s.is_sparse AS [IsSparse] -FROM -sys.database_files AS s -WHERE -(s.type = 1) -ORDER BY -[Name] ASC Core .Net SqlClient Data Provider sa 0 6 0 0 1239302740 59 2017-08-04 14:30:12.120 2017-08-04 14:30:12.120 -Audit Login -- network protocol: TCP/IP -set quoted_identifier on -set arithabort off -set numeric_roundabort off -set ansi_warnings on -set ansi_padding on -set ansi_nulls on -set concat_null_yields_null on -set cursor_close_on_commit off -set implicit_transactions off -set language us_english -set dateformat mdy -set datefirst 7 -set transaction isolation level read committed - carbon sa 1239302740 60 2017-08-04 14:30:12.173 -SQL:BatchStarting SELECT s.name AS schema_name, o.[name] AS object_name, o.[type] AS object_type - FROM sys.all_objects o - INNER JOIN sys.schemas s ON o.schema_id = s.schema_id - WHERE (o.[type] = 'P' OR o.[type] = 'V' OR o.[type] = 'U') ORDER BY object_type, schema_name, object_name carbon sa 1239302740 60 2017-08-04 14:30:12.177 -SQL:BatchCompleted SELECT s.name AS schema_name, o.[name] AS object_name, o.[type] AS object_type - FROM sys.all_objects o - INNER JOIN sys.schemas s ON o.schema_id = s.schema_id - WHERE (o.[type] = 'P' OR o.[type] = 'V' OR o.[type] = 'U') ORDER BY object_type, schema_name, object_name carbon sa 31 100 1 42 1239302740 60 2017-08-04 14:30:12.177 2017-08-04 14:30:12.220 -Audit Logout carbon sa 31 100 1 434583 1239302740 60 2017-08-04 14:30:12.173 2017-08-04 14:37:26.757 -Audit Logout carbon sa 16 15 0 1815690 1239302740 56 2017-08-04 14:30:06.520 2017-08-04 15:00:22.210 -Audit Logout carbon sa 0 15 0 1815387 1239302740 58 2017-08-04 14:30:06.823 2017-08-04 15:00:22.210 -Audit Logout carbon sa 15 187 0 1815433 1239302740 57 2017-08-04 14:30:06.780 2017-08-04 15:00:22.213 -Audit Logout Core .Net SqlClient Data Provider sa 47 1107 3 1813947 1239302740 59 2017-08-04 14:30:11.543 2017-08-04 15:00:25.490 diff --git a/src/sql/parts/query/common/flavorStatus.ts b/src/sql/parts/query/common/flavorStatus.ts index aeb16ba625..93a3ed3e5c 100644 --- a/src/sql/parts/query/common/flavorStatus.ts +++ b/src/sql/parts/query/common/flavorStatus.ts @@ -18,7 +18,7 @@ import { TPromise } from 'vs/base/common/winjs.base'; import { getCodeEditor } from 'vs/editor/browser/editorBrowser'; import nls = require('vs/nls'); -import { IConnectionManagementService } from 'sql/parts/connection/common/connectionManagement'; +import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement'; import * as WorkbenchUtils from 'sql/workbench/common/sqlWorkbenchUtils'; import { DidChangeLanguageFlavorParams } from 'sqlops'; diff --git a/src/sql/parts/query/common/queryEditorService.ts b/src/sql/parts/query/common/queryEditorService.ts index ddd3a37891..16dad0ebfc 100644 --- a/src/sql/parts/query/common/queryEditorService.ts +++ b/src/sql/parts/query/common/queryEditorService.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import { createDecorator } from 'vs/platform/instantiation/common/instantiation'; -import { IConnectableInput } from 'sql/parts/connection/common/connectionManagement'; +import { IConnectableInput } from 'sql/platform/connection/common/connectionManagement'; import { IEditorOptions } from 'vs/platform/editor/common/editor'; import { QueryEditorService } from 'sql/parts/query/services/queryEditorService'; diff --git a/src/sql/parts/query/common/queryInput.ts b/src/sql/parts/query/common/queryInput.ts index 7b26ea1d5d..0c72e09110 100644 --- a/src/sql/parts/query/common/queryInput.ts +++ b/src/sql/parts/query/common/queryInput.ts @@ -13,9 +13,9 @@ import { EditorInput, EditorModel, ConfirmResult, EncodingMode, IEncodingSupport import { IConfigurationService } from 'vs/platform/configuration/common/configuration'; import { IEditorViewState } from 'vs/editor/common/editorCommon'; -import { IConnectionManagementService, IConnectableInput, INewConnectionParams, RunQueryOnConnectionMode } from 'sql/parts/connection/common/connectionManagement'; +import { IConnectionManagementService, IConnectableInput, INewConnectionParams, RunQueryOnConnectionMode } from 'sql/platform/connection/common/connectionManagement'; import { QueryResultsInput } from 'sql/parts/query/common/queryResultsInput'; -import { IQueryModelService } from 'sql/parts/query/execution/queryModel'; +import { IQueryModelService } from 'sql/platform/query/common/queryModel'; import { IQueryEditorService } from 'sql/parts/query/common/queryEditorService'; import { ISelectionData, ExecutionPlanOptions } from 'sqlops'; diff --git a/src/sql/parts/query/common/rowCountStatus.ts b/src/sql/parts/query/common/rowCountStatus.ts index ec45d137ef..4af3e79600 100644 --- a/src/sql/parts/query/common/rowCountStatus.ts +++ b/src/sql/parts/query/common/rowCountStatus.ts @@ -4,8 +4,8 @@ *--------------------------------------------------------------------------------------------*/ import * as WorkbenchUtils from 'sql/workbench/common/sqlWorkbenchUtils'; -import { IQueryModelService } from '../execution/queryModel'; -import QueryRunner from 'sql/parts/query/execution/queryRunner'; +import { IQueryModelService } from 'sql/platform/query/common/queryModel'; +import QueryRunner from 'sql/platform/query/common/queryRunner'; import { IStatusbarItem } from 'vs/workbench/browser/parts/statusbar/statusbar'; import { IDisposable, combinedDisposable, dispose } from 'vs/base/common/lifecycle'; diff --git a/src/sql/parts/query/common/timeElapsedStatus.ts b/src/sql/parts/query/common/timeElapsedStatus.ts index 199e9ef517..970060062d 100644 --- a/src/sql/parts/query/common/timeElapsedStatus.ts +++ b/src/sql/parts/query/common/timeElapsedStatus.ts @@ -4,9 +4,9 @@ *--------------------------------------------------------------------------------------------*/ import * as WorkbenchUtils from 'sql/workbench/common/sqlWorkbenchUtils'; -import { IQueryModelService } from '../execution/queryModel'; -import QueryRunner from 'sql/parts/query/execution/queryRunner'; -import { parseNumAsTimeString } from 'sql/parts/connection/common/utils'; +import { IQueryModelService } from 'sql/platform/query/common/queryModel'; +import QueryRunner from 'sql/platform/query/common/queryRunner'; +import { parseNumAsTimeString } from 'sql/platform/connection/common/utils'; import { IStatusbarItem } from 'vs/workbench/browser/parts/statusbar/statusbar'; import { IDisposable, combinedDisposable, dispose } from 'vs/base/common/lifecycle'; diff --git a/src/sql/parts/query/editor/actions.ts b/src/sql/parts/query/editor/actions.ts index 78cb7b8717..4283de509d 100644 --- a/src/sql/parts/query/editor/actions.ts +++ b/src/sql/parts/query/editor/actions.ts @@ -13,7 +13,7 @@ import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService import { ITree } from 'vs/base/parts/tree/browser/tree'; import { IEditorService } from 'vs/workbench/services/editor/common/editorService'; -import QueryRunner from 'sql/parts/query/execution/queryRunner'; +import QueryRunner from 'sql/platform/query/common/queryRunner'; import { SaveFormat } from 'sql/parts/grid/common/interfaces'; import { Table } from 'sql/base/browser/ui/table/table'; import { GridTableState } from 'sql/parts/query/editor/gridPanel'; diff --git a/src/sql/parts/query/editor/charting/actions.ts b/src/sql/parts/query/editor/charting/actions.ts index e4c6bac289..d9b4b03989 100644 --- a/src/sql/parts/query/editor/charting/actions.ts +++ b/src/sql/parts/query/editor/charting/actions.ts @@ -7,10 +7,10 @@ import { IInsightOptions, IInsight } from './insights/interfaces'; import { Graph } from './insights/graphInsight'; -import * as PathUtilities from 'sql/common/pathUtilities'; import { QueryEditor } from 'sql/parts/query/editor/queryEditor'; import { IClipboardService } from 'sql/platform/clipboard/common/clipboardService'; import { IInsightsConfig } from 'sql/parts/dashboard/widgets/insights/interfaces'; +import { resolveCurrentDirectory, getRootPath } from 'sql/platform/node/pathUtilities'; import { localize } from 'vs/nls'; import { Action } from 'vs/base/common/actions'; @@ -190,7 +190,7 @@ export class SaveImageAction extends Action { } private promptForFilepath(): TPromise { - let filepathPlaceHolder = PathUtilities.resolveCurrentDirectory(this.getActiveUriString(), PathUtilities.getRootPath(this.workspaceContextService)); + let filepathPlaceHolder = resolveCurrentDirectory(this.getActiveUriString(), getRootPath(this.workspaceContextService)); filepathPlaceHolder = join(filepathPlaceHolder, 'chart.png'); return this.windowService.showSaveDialog({ title: localize('chartViewer.saveAsFileTitle', 'Choose Results File'), diff --git a/src/sql/parts/query/editor/charting/chartTab.ts b/src/sql/parts/query/editor/charting/chartTab.ts index 911ff0dc38..25e31c80da 100644 --- a/src/sql/parts/query/editor/charting/chartTab.ts +++ b/src/sql/parts/query/editor/charting/chartTab.ts @@ -7,7 +7,7 @@ import { IPanelTab } from 'sql/base/browser/ui/panel/panel'; import { ChartView } from './chartView'; -import QueryRunner from 'sql/parts/query/execution/queryRunner'; +import QueryRunner from 'sql/platform/query/common/queryRunner'; import { localize } from 'vs/nls'; import { generateUuid } from 'vs/base/common/uuid'; diff --git a/src/sql/parts/query/editor/charting/chartView.ts b/src/sql/parts/query/editor/charting/chartView.ts index 842ecad986..65f29da6ee 100644 --- a/src/sql/parts/query/editor/charting/chartView.ts +++ b/src/sql/parts/query/editor/charting/chartView.ts @@ -9,7 +9,7 @@ import 'vs/css!./chartView'; import { IPanelView } from 'sql/base/browser/ui/panel/panel'; import { Insight } from './insights/insight'; -import QueryRunner from 'sql/parts/query/execution/queryRunner'; +import QueryRunner from 'sql/platform/query/common/queryRunner'; import { IInsightData } from 'sql/parts/dashboard/widgets/insights/interfaces'; import { ChartOptions, IChartOption, ControlType } from './chartOptions'; import { Extensions, IInsightRegistry } from 'sql/platform/dashboard/common/insightRegistry'; diff --git a/src/sql/parts/query/editor/gridPanel.ts b/src/sql/parts/query/editor/gridPanel.ts index ced945d163..586eab8dd8 100644 --- a/src/sql/parts/query/editor/gridPanel.ts +++ b/src/sql/parts/query/editor/gridPanel.ts @@ -7,7 +7,7 @@ import * as pretty from 'pretty-data'; import { attachTableStyler } from 'sql/common/theme/styler'; -import QueryRunner from 'sql/parts/query/execution/queryRunner'; +import QueryRunner from 'sql/platform/query/common/queryRunner'; import { VirtualizedCollection, AsyncDataProvider } from 'sql/base/browser/ui/table/asyncDataView'; import { Table } from 'sql/base/browser/ui/table/table'; import { ScrollableSplitView, IView } from 'sql/base/browser/ui/scrollableSplitview/scrollableSplitview'; diff --git a/src/sql/parts/query/editor/messagePanel.ts b/src/sql/parts/query/editor/messagePanel.ts index 28b1fc7564..2f2dda0a00 100644 --- a/src/sql/parts/query/editor/messagePanel.ts +++ b/src/sql/parts/query/editor/messagePanel.ts @@ -6,7 +6,7 @@ import 'vs/css!./media/messagePanel'; import { IMessagesActionContext, CopyMessagesAction, CopyAllMessagesAction } from './actions'; -import QueryRunner from 'sql/parts/query/execution/queryRunner'; +import QueryRunner from 'sql/platform/query/common/queryRunner'; import { QueryInput } from 'sql/parts/query/common/queryInput'; import { IResultMessage, ISelectionData } from 'sqlops'; diff --git a/src/sql/parts/query/editor/queryEditor.ts b/src/sql/parts/query/editor/queryEditor.ts index 767cb5570d..11c262e44d 100644 --- a/src/sql/parts/query/editor/queryEditor.ts +++ b/src/sql/parts/query/editor/queryEditor.ts @@ -42,9 +42,9 @@ import { ConnectDatabaseAction, ToggleConnectDatabaseAction, EstimatedQueryPlanAction, ActualQueryPlanAction } from 'sql/parts/query/execution/queryActions'; -import { IQueryModelService } from 'sql/parts/query/execution/queryModel'; +import { IQueryModelService } from 'sql/platform/query/common/queryModel'; import { IEditorDescriptorService } from 'sql/parts/query/editor/editorDescriptorService'; -import { IConnectionManagementService } from 'sql/parts/connection/common/connectionManagement'; +import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement'; import { IConfigurationService } from 'vs/platform/configuration/common/configuration'; import { CancellationToken } from 'vs/base/common/cancellation'; import { ICodeEditor } from 'vs/editor/browser/editorBrowser'; diff --git a/src/sql/parts/query/editor/queryResultsEditor.ts b/src/sql/parts/query/editor/queryResultsEditor.ts index 0dc51277c5..0b17ccece9 100644 --- a/src/sql/parts/query/editor/queryResultsEditor.ts +++ b/src/sql/parts/query/editor/queryResultsEditor.ts @@ -19,7 +19,7 @@ import * as types from 'vs/base/common/types'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; import { QueryResultsInput } from 'sql/parts/query/common/queryResultsInput'; -import { IQueryModelService } from 'sql/parts/query/execution/queryModel'; +import { IQueryModelService } from 'sql/platform/query/common/queryModel'; import { QueryResultsView } from 'sql/parts/query/editor/queryResultsView'; import { CancellationToken } from 'vs/base/common/cancellation'; diff --git a/src/sql/parts/query/editor/queryResultsView.ts b/src/sql/parts/query/editor/queryResultsView.ts index b3cbc958d4..648e946893 100644 --- a/src/sql/parts/query/editor/queryResultsView.ts +++ b/src/sql/parts/query/editor/queryResultsView.ts @@ -6,8 +6,8 @@ import { QueryResultsInput, ResultsViewState } from 'sql/parts/query/common/queryResultsInput'; import { TabbedPanel, IPanelTab, IPanelView } from 'sql/base/browser/ui/panel/panel'; -import { IQueryModelService } from '../execution/queryModel'; -import QueryRunner from 'sql/parts/query/execution/queryRunner'; +import { IQueryModelService } from 'sql/platform/query/common/queryModel'; +import QueryRunner from 'sql/platform/query/common/queryRunner'; import { MessagePanel } from './messagePanel'; import { GridPanel } from './gridPanel'; import { ChartTab } from './charting/chartTab'; diff --git a/src/sql/parts/query/execution/keyboardQueryActions.ts b/src/sql/parts/query/execution/keyboardQueryActions.ts index 5a781e2982..a4218083b3 100644 --- a/src/sql/parts/query/execution/keyboardQueryActions.ts +++ b/src/sql/parts/query/execution/keyboardQueryActions.ts @@ -12,13 +12,13 @@ import { IWorkspaceConfigurationService } from 'vs/workbench/services/configurat import * as sqlops from 'sqlops'; -import { IQueryManagementService } from 'sql/parts/query/common/queryManagement'; -import { IConnectionManagementService } from 'sql/parts/connection/common/connectionManagement'; +import { IQueryManagementService } from 'sql/platform/query/common/queryManagement'; +import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement'; import { QueryEditor } from 'sql/parts/query/editor/queryEditor'; -import { IQueryModelService } from 'sql/parts/query/execution/queryModel'; +import { IQueryModelService } from 'sql/platform/query/common/queryModel'; import * as WorkbenchUtils from 'sql/workbench/common/sqlWorkbenchUtils'; import * as Constants from 'sql/parts/query/common/constants'; -import * as ConnectionConstants from 'sql/parts/connection/common/constants'; +import * as ConnectionConstants from 'sql/platform/connection/common/constants'; import { EditDataEditor } from 'sql/parts/editData/editor/editDataEditor'; import { INotificationService, Severity } from 'vs/platform/notification/common/notification'; diff --git a/src/sql/parts/query/execution/queryActions.ts b/src/sql/parts/query/execution/queryActions.ts index b7c7c087ad..fdafae6e48 100644 --- a/src/sql/parts/query/execution/queryActions.ts +++ b/src/sql/parts/query/execution/queryActions.ts @@ -22,9 +22,9 @@ import { INewConnectionParams, ConnectionType, RunQueryOnConnectionMode -} from 'sql/parts/connection/common/connectionManagement'; +} from 'sql/platform/connection/common/connectionManagement'; import { QueryEditor } from 'sql/parts/query/editor/queryEditor'; -import { IQueryModelService } from 'sql/parts/query/execution/queryModel'; +import { IQueryModelService } from 'sql/platform/query/common/queryModel'; import { INotificationService } from 'vs/platform/notification/common/notification'; import Severity from 'vs/base/common/severity'; import { SelectBox } from 'sql/base/browser/ui/selectBox/selectBox'; diff --git a/src/sql/parts/query/execution/queryStatus.ts b/src/sql/parts/query/execution/queryStatus.ts index 33b759350a..e519fd0c1f 100644 --- a/src/sql/parts/query/execution/queryStatus.ts +++ b/src/sql/parts/query/execution/queryStatus.ts @@ -9,13 +9,13 @@ import { IStatusbarItem } from 'vs/workbench/browser/parts/statusbar/statusbar'; import { IEditorCloseEvent } from 'vs/workbench/common/editor'; import { IEditorService } from 'vs/workbench/services/editor/common/editorService'; import { IEditorGroupsService } from 'vs/workbench/services/group/common/editorGroupsService'; -import { IQueryModelService } from 'sql/parts/query/execution/queryModel'; +import { IQueryModelService } from 'sql/platform/query/common/queryModel'; import LocalizedConstants = require('sql/parts/query/common/localizedConstants'); import * as WorkbenchUtils from 'sql/workbench/common/sqlWorkbenchUtils'; import { EditorServiceImpl } from 'vs/workbench/browser/parts/editor/editor'; // Query execution status -enum QueryExecutionStatus{ +enum QueryExecutionStatus { Executing, Completed } @@ -43,8 +43,8 @@ export class QueryStatusbarItem implements IStatusbarItem { this._toDispose = []; this._toDispose.push( - this._queryModelService.onRunQueryStart((uri:string) => this._onRunQueryStart(uri)), - this._queryModelService.onRunQueryComplete((uri:string) => this._onRunQueryComplete(uri)), + this._queryModelService.onRunQueryStart((uri: string) => this._onRunQueryStart(uri)), + this._queryModelService.onRunQueryComplete((uri: string) => this._onRunQueryComplete(uri)), this._editorService.onDidVisibleEditorsChange(() => this._onEditorsChanged()), this._editorService.onDidCloseEditor(event => this._onEditorClosed(event)) ); @@ -52,7 +52,7 @@ export class QueryStatusbarItem implements IStatusbarItem { return combinedDisposable(this._toDispose); } - private _onEditorClosed(event: IEditorCloseEvent): void{ + private _onEditorClosed(event: IEditorCloseEvent): void { let uri = WorkbenchUtils.getEditorUri(event.editor); if (uri && uri in this._queryStatusEditors) { // If active editor is being closed, hide the query status. @@ -67,13 +67,13 @@ export class QueryStatusbarItem implements IStatusbarItem { } } - private _onEditorsChanged(): void{ + private _onEditorsChanged(): void { let activeEditor = this._editorService.activeControl; if (activeEditor) { let uri = WorkbenchUtils.getEditorUri(activeEditor.input); // Show active editor's query status - if (uri && uri in this._queryStatusEditors){ + if (uri && uri in this._queryStatusEditors) { this._showStatus(uri); } else { hide(this._queryElement); @@ -92,7 +92,7 @@ export class QueryStatusbarItem implements IStatusbarItem { } // Update query status for the editor - private _updateStatus(uri: string, newStatus: QueryExecutionStatus){ + private _updateStatus(uri: string, newStatus: QueryExecutionStatus) { if (uri) { this._queryStatusEditors[uri] = newStatus; this._showStatus(uri); @@ -100,12 +100,12 @@ export class QueryStatusbarItem implements IStatusbarItem { } // Show/hide query status for active editor - private _showStatus(uri: string): void{ + private _showStatus(uri: string): void { let activeEditor = this._editorService.activeControl; if (activeEditor) { let currentUri = WorkbenchUtils.getEditorUri(activeEditor.input); if (uri === currentUri) { - switch(this._queryStatusEditors[uri]){ + switch (this._queryStatusEditors[uri]) { case QueryExecutionStatus.Executing: this._queryElement.textContent = LocalizedConstants.msgStatusRunQueryInProgress; show(this._queryElement); diff --git a/src/sql/parts/query/services/queryEditorService.ts b/src/sql/parts/query/services/queryEditorService.ts index 12254802bc..8f2590933d 100644 --- a/src/sql/parts/query/services/queryEditorService.ts +++ b/src/sql/parts/query/services/queryEditorService.ts @@ -6,7 +6,7 @@ import { QueryResultsInput } from 'sql/parts/query/common/queryResultsInput'; import { QueryInput } from 'sql/parts/query/common/queryInput'; import { EditDataInput } from 'sql/parts/editData/common/editDataInput'; -import { IConnectableInput, IConnectionManagementService } from 'sql/parts/connection/common/connectionManagement'; +import { IConnectableInput, IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement'; import { IEditorGroupsService, IEditorGroup } from 'vs/workbench/services/group/common/editorGroupsService'; import { IQueryEditorService, IQueryEditorOptions } from 'sql/parts/query/common/queryEditorService'; import { QueryPlanInput } from 'sql/parts/queryPlan/queryPlanInput'; diff --git a/src/sql/parts/query/views/queryOutput.component.html b/src/sql/parts/query/views/queryOutput.component.html deleted file mode 100644 index 32bc9f62f3..0000000000 --- a/src/sql/parts/query/views/queryOutput.component.html +++ /dev/null @@ -1,41 +0,0 @@ - - - - - -
- -
- - - - - -
- -
- - - - - -
- -
- - - - - -
- - -
- - - \ No newline at end of file diff --git a/src/sql/parts/query/views/queryOutput.component.ts b/src/sql/parts/query/views/queryOutput.component.ts deleted file mode 100644 index 7ce155be3f..0000000000 --- a/src/sql/parts/query/views/queryOutput.component.ts +++ /dev/null @@ -1,114 +0,0 @@ -/*--------------------------------------------------------------------------------------------- - * Copyright (c) Microsoft Corporation. All rights reserved. - * Licensed under the Source EULA. See License.txt in the project root for license information. - *--------------------------------------------------------------------------------------------*/ - -'use strict'; - -import 'vs/css!sql/parts/grid/media/slickColorTheme'; -import 'vs/css!sql/parts/grid/media/flexbox'; -import 'vs/css!sql/parts/grid/media/styles'; -import 'vs/css!sql/parts/grid/media/slick.grid'; -import 'vs/css!sql/parts/grid/media/slickGrid'; - -import { ElementRef, ChangeDetectorRef, OnInit, OnDestroy, Component, Inject, forwardRef, ViewChild } from '@angular/core'; -import { IBootstrapParams } from 'sql/services/bootstrap/bootstrapService'; -import { IQueryComponentParams } from 'sql/services/bootstrap/bootstrapParams'; -import { QueryComponent } from 'sql/parts/grid/views/query/query.component'; -import { QueryPlanComponent } from 'sql/parts/queryPlan/queryPlan.component'; -import { TopOperationsComponent } from 'sql/parts/queryPlan/topOperations.component'; -import { toDisposableSubscription } from 'sql/parts/common/rxjsUtils'; -import { PanelComponent, IPanelOptions } from 'sql/base/browser/ui/panel/panel.component'; - -import * as nls from 'vs/nls'; -import { IDisposable } from 'vs/base/common/lifecycle'; -import { IConfigurationService } from 'vs/platform/configuration/common/configuration'; - -export const QUERY_OUTPUT_SELECTOR: string = 'query-output-component'; - -declare type PaneType = 'messages' | 'results'; - -@Component({ - selector: QUERY_OUTPUT_SELECTOR, - templateUrl: decodeURI(require.toUrl('sql/parts/query/views/queryOutput.component.html')) -}) -export class QueryOutputComponent implements OnDestroy { - - @ViewChild(QueryComponent) queryComponent: QueryComponent; - @ViewChild(QueryPlanComponent) queryPlanComponent: QueryPlanComponent; - @ViewChild(TopOperationsComponent) topOperationsComponent: TopOperationsComponent; - - @ViewChild(PanelComponent) private _panel: PanelComponent; - - private activeDataSet: any; - - // tslint:disable:no-unused-variable - private readonly queryComponentTitle: string = nls.localize('results', 'Results'); - private readonly queryPlanTitle: string = nls.localize('queryPlan', 'Query Plan'); - private readonly topOperationsTitle: string = nls.localize('topOperations', 'Top Operations'); - private readonly chartViewerTitle: string = nls.localize('chartViewer', 'Chart Viewer'); - - private readonly resultsTabIdentifier = 'results'; - private readonly queryPlanTabIdentifier = 'queryPlan'; - private readonly chartViewerTabIdentifier = 'chartViewer'; - private readonly topOperationsTabIdentifier = 'topOperations'; - // tslint:enable:no-unused-variable - - private hasQueryPlan = false; - private showChartView = false; - - // tslint:disable-next-line:no-unused-variable - private readonly panelOpt: IPanelOptions = { - showTabsWhenOne: false - }; - - private _disposables: Array = []; - - constructor( - @Inject(forwardRef(() => ElementRef)) el: ElementRef, - @Inject(forwardRef(() => ChangeDetectorRef)) private _cd: ChangeDetectorRef, - @Inject(IBootstrapParams) public queryParameters: IQueryComponentParams, - @Inject(IConfigurationService) private _configurationService: IConfigurationService - ) { - } - - /** - * Called by Angular when the object is initialized - */ - public ngAfterViewInit(): void { - this._disposables.push(toDisposableSubscription(this.queryComponent.queryPlanAvailable.subscribe((xml) => { - if (this._configurationService.getValue('workbench')['enablePreviewFeatures']) { - this.hasQueryPlan = true; - this._cd.detectChanges(); - this._panel.selectTab(this.topOperationsTabIdentifier); - this.topOperationsComponent.planXml = xml; - this._panel.selectTab(this.queryPlanTabIdentifier); - this.queryPlanComponent.planXml = xml; - } - }))); - - this._disposables.push(toDisposableSubscription(this.queryComponent.showChartRequested.subscribe((dataSet) => { - this.showChartView = true; - this._cd.detectChanges(); - this.activeDataSet = dataSet; - this._panel.selectTab(this.chartViewerTabIdentifier); - }))); - - this._disposables.push(toDisposableSubscription(this.queryComponent.queryExecutionStatus.subscribe(status => { - if (status === 'start') { - this._panel.selectTab(this.resultsTabIdentifier); - this.hasQueryPlan = false; - this.showChartView = false; - this._cd.detectChanges(); - } - }))); - - this._disposables.push(toDisposableSubscription(this.queryComponent.goToNextQueryOutputTabRequested.subscribe(() => { - this._panel.selectOnNextTab(); - }))); - } - - public ngOnDestroy(): void { - this._disposables.forEach(i => i.dispose()); - } -} diff --git a/src/sql/parts/query/views/queryOutput.module.ts b/src/sql/parts/query/views/queryOutput.module.ts deleted file mode 100644 index 36ece0bacc..0000000000 --- a/src/sql/parts/query/views/queryOutput.module.ts +++ /dev/null @@ -1,92 +0,0 @@ -/*--------------------------------------------------------------------------------------------- -* Copyright (c) Microsoft Corporation. All rights reserved. -* Licensed under the Source EULA. See License.txt in the project root for license information. -*--------------------------------------------------------------------------------------------*/ - - -import { ApplicationRef, ComponentFactoryResolver, forwardRef, NgModule, Inject, Type } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { BrowserModule } from '@angular/platform-browser'; -import { FormsModule } from '@angular/forms'; -import { SlickGrid } from 'angular2-slickgrid'; -import { ChartsModule } from 'ng2-charts/ng2-charts'; - -const BrowserAnimationsModule = (require.__$__nodeRequire('@angular/platform-browser/animations')).BrowserAnimationsModule; - -import { IBootstrapParams, ISelector, providerIterator } from 'sql/services/bootstrap/bootstrapService'; -import { Extensions, IInsightRegistry } from 'sql/platform/dashboard/common/insightRegistry'; - -import { Registry } from 'vs/platform/registry/common/platform'; -import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; - - -import { QueryOutputComponent } from 'sql/parts/query/views/queryOutput.component'; -import { QueryPlanComponent, } from 'sql/parts/queryPlan/queryPlan.component'; -import { QueryComponent } from 'sql/parts/grid/views/query/query.component'; -import { TopOperationsComponent } from 'sql/parts/queryPlan/topOperations.component'; - -import { ChartViewerComponent } from 'sql/parts/grid/views/query/chartViewer.component'; - -import { PanelModule } from 'sql/base/browser/ui/panel/panel.module'; - -/* Directives */ -import { ComponentHostDirective } from 'sql/parts/dashboard/common/componentHost.directive'; -import { MouseDownDirective } from 'sql/parts/grid/directives/mousedown.directive'; -import { ScrollDirective } from 'sql/parts/grid/directives/scroll.directive'; - -import { Checkbox } from 'sql/base/browser/ui/checkbox/checkbox.component'; -import { SelectBox } from 'sql/base/browser/ui/selectBox/selectBox.component'; -import { InputBox } from 'sql/base/browser/ui/inputBox/inputBox.component'; - -let baseComponents = [QueryComponent, ComponentHostDirective, QueryOutputComponent, QueryPlanComponent, TopOperationsComponent, ChartViewerComponent]; -/* Insights */ -let insightComponents = Registry.as(Extensions.InsightContribution).getAllCtors(); - -export const QueryOutputModule = (params: IBootstrapParams, selector: string, instantiationService: IInstantiationService): Type => { - - @NgModule({ - imports: [ - CommonModule, - BrowserModule, - FormsModule, - BrowserAnimationsModule, - ChartsModule, - PanelModule - ], - declarations: [ - ...baseComponents, - ...insightComponents, - SlickGrid, - ScrollDirective, - MouseDownDirective, - Checkbox, - SelectBox, - InputBox - ], - entryComponents: [ - QueryOutputComponent, - ...insightComponents - ], - providers: [ - { provide: IBootstrapParams, useValue: params }, - { provide: ISelector, useValue: selector }, - ...providerIterator(instantiationService) - ] - }) - class ModuleClass { - - constructor( - @Inject(forwardRef(() => ComponentFactoryResolver)) private _resolver: ComponentFactoryResolver, - @Inject(ISelector) private selector: string - ) { - } - - ngDoBootstrap(appRef: ApplicationRef) { - const factory = this._resolver.resolveComponentFactory(QueryOutputComponent); - (factory).factory.selector = this.selector; - appRef.bootstrap(factory); - } - } - - return ModuleClass; -}; diff --git a/src/sql/parts/queryPlan/planXmlParser.ts b/src/sql/parts/queryPlan/planXmlParser.ts index 9f308d6a25..08f095496a 100644 --- a/src/sql/parts/queryPlan/planXmlParser.ts +++ b/src/sql/parts/queryPlan/planXmlParser.ts @@ -72,7 +72,7 @@ export class PlanNode { indexObject: IndexObject; public addChildren(children: PlanNode[]): void { - if(children) { + if (children) { children.forEach(element => { element.parent = this; }); @@ -198,7 +198,7 @@ export class PlanXmlParser { return undefined; } - for (var index = 0; index < element.childNodes.length; index++) { + for (let index = 0; index < element.childNodes.length; index++) { if (element.childNodes[index].nodeName.toLocaleLowerCase() === elementName.toLocaleLowerCase()) { elements = elements.concat(element.children[index]); } @@ -206,13 +206,13 @@ export class PlanXmlParser { if (elements.length > 0) { return elements; } - for (var index = 0; index < element.childNodes.length; index++) { + for (let index = 0; index < element.childNodes.length; index++) { if (untilNode && element.childNodes[index].nodeName === untilNode) { continue; } let result = this.findChildren(element.children[index], elementName, untilNode); if (result !== undefined) { - return result; + return result; } } @@ -224,7 +224,7 @@ export class PlanXmlParser { let children = this.findChildren(element, elementName); if (children) { - for (var index = 0; index < children.length; index++) { + for (let index = 0; index < children.length; index++) { let childNode = children[index]; let planNode = this.convertToPlanNode(childNode); @@ -285,8 +285,8 @@ export class PlanXmlParser { } private findAttribute(attributes: NamedNodeMap, attName: string): any { - for (var index = 0; index < attributes.length; index++) { - var attribute = attributes[index]; + for (let index = 0; index < attributes.length; index++) { + let attribute = attributes[index]; if (attribute.name === attName) { return attribute.value; } diff --git a/src/sql/parts/queryPlan/queryPlanEditor.ts b/src/sql/parts/queryPlan/queryPlanEditor.ts index 9b5d2b9faa..5817d4a26d 100644 --- a/src/sql/parts/queryPlan/queryPlanEditor.ts +++ b/src/sql/parts/queryPlan/queryPlanEditor.ts @@ -11,11 +11,11 @@ import { BaseEditor } from 'vs/workbench/browser/parts/editor/baseEditor'; import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry'; import { IThemeService } from 'vs/platform/theme/common/themeService'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; -import { QueryPlanInput } from './queryPlanInput'; -import { QueryPlanModule } from './queryPlan.module'; -import { IConnectionManagementService } from 'sql/parts/connection/common/connectionManagement'; -import { IMetadataService } from 'sql/services/metadata/metadataService'; -import { IScriptingService } from 'sql/services/scripting/scriptingService'; +import { QueryPlanInput } from 'sql/parts/queryPlan/queryPlanInput'; +import { QueryPlanModule } from 'sql/parts/queryPlan/queryPlan.module'; +import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement'; +import { IMetadataService } from 'sql/platform/metadata/common/metadataService'; +import { IScriptingService } from 'sql/platform/scripting/common/scriptingService'; import { IQueryEditorService } from 'sql/parts/query/common/queryEditorService'; import { bootstrapAngular } from 'sql/services/bootstrap/bootstrapService'; import { IQueryPlanParams } from 'sql/services/bootstrap/bootstrapParams'; diff --git a/src/sql/parts/queryPlan/queryPlanInput.ts b/src/sql/parts/queryPlan/queryPlanInput.ts index 022e1fa8ff..0ee498de12 100644 --- a/src/sql/parts/queryPlan/queryPlanInput.ts +++ b/src/sql/parts/queryPlan/queryPlanInput.ts @@ -6,8 +6,8 @@ import { TPromise } from 'vs/base/common/winjs.base'; import { EditorInput, EditorModel } from 'vs/workbench/common/editor'; import { UntitledEditorInput } from 'vs/workbench/common/editor/untitledEditorInput'; -import { IConnectionProfile } from 'sql/parts/connection/common/interfaces'; -import { ConnectionManagementInfo } from 'sql/parts/connection/common/connectionManagementInfo'; +import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; +import { ConnectionManagementInfo } from 'sql/platform/connection/common/connectionManagementInfo'; export class QueryPlanInput extends EditorInput { @@ -55,7 +55,7 @@ export class QueryPlanInput extends EditorInput { public get hasInitialized(): boolean { return !!this._uniqueSelector; - } + } public get uniqueSelector(): string { return this._uniqueSelector; diff --git a/src/sql/parts/queryPlan/topOperations.component.ts b/src/sql/parts/queryPlan/topOperations.component.ts index e08dc08853..82d3b2564c 100644 --- a/src/sql/parts/queryPlan/topOperations.component.ts +++ b/src/sql/parts/queryPlan/topOperations.component.ts @@ -13,7 +13,7 @@ import { attachTableStyler } from 'sql/common/theme/styler'; import { IQueryComponentParams } from 'sql/services/bootstrap/bootstrapParams'; import * as GridContentEvents from 'sql/parts/grid/common/gridContentEvents'; import { DataService } from 'sql/parts/grid/services/dataService'; -import { toDisposableSubscription } from 'sql/parts/common/rxjsUtils'; +import { toDisposableSubscription } from 'sql/base/node/rxjsUtils'; import { localize } from 'vs/nls'; import { IDisposable, dispose } from 'vs/base/common/lifecycle'; diff --git a/src/sql/parts/taskHistory/common/taskHistory.contribution.ts b/src/sql/parts/taskHistory/common/taskHistory.contribution.ts index c8c215e39b..2bb382c5aa 100644 --- a/src/sql/parts/taskHistory/common/taskHistory.contribution.ts +++ b/src/sql/parts/taskHistory/common/taskHistory.contribution.ts @@ -18,7 +18,7 @@ import { Extensions, IConfigurationRegistry } from 'vs/platform/configuration/co import { VIEWLET_ID, TaskHistoryViewlet } from 'sql/parts/taskHistory/viewlet/taskHistoryViewlet'; import lifecycle = require('vs/base/common/lifecycle'); import ext = require('vs/workbench/common/contributions'); -import { ITaskService } from 'sql/parts/taskHistory/common/taskService'; +import { ITaskService } from 'sql/platform/taskHistory/common/taskService'; import { IActivityService, NumberBadge } from 'vs/workbench/services/activity/common/activity'; import { LifecyclePhase } from 'vs/platform/lifecycle/common/lifecycle'; import { IEditorGroupsService } from 'vs/workbench/services/group/common/editorGroupsService'; diff --git a/src/sql/parts/taskHistory/viewlet/taskAction.ts b/src/sql/parts/taskHistory/viewlet/taskAction.ts index c027897e0d..1cde9a3fb3 100644 --- a/src/sql/parts/taskHistory/viewlet/taskAction.ts +++ b/src/sql/parts/taskHistory/viewlet/taskAction.ts @@ -6,11 +6,11 @@ import { localize } from 'vs/nls'; import { TPromise } from 'vs/base/common/winjs.base'; import { Action } from 'vs/base/common/actions'; -import { ITaskService } from 'sql/parts/taskHistory/common/taskService'; +import { ITaskService } from 'sql/platform/taskHistory/common/taskService'; import { TaskNode } from 'sql/parts/taskHistory/common/taskNode'; -import { IErrorMessageService } from 'sql/parts/connection/common/connectionManagement'; import { IQueryEditorService } from 'sql/parts/query/common/queryEditorService'; import Severity from 'vs/base/common/severity'; +import { IErrorMessageService } from 'sql/platform/errorMessage/common/errorMessageService'; export class CancelAction extends Action { public static ID = 'taskHistory.cancel'; diff --git a/src/sql/parts/taskHistory/viewlet/taskHistoryRenderer.ts b/src/sql/parts/taskHistory/viewlet/taskHistoryRenderer.ts index bbc47701fa..c2d6b68707 100644 --- a/src/sql/parts/taskHistory/viewlet/taskHistoryRenderer.ts +++ b/src/sql/parts/taskHistory/viewlet/taskHistoryRenderer.ts @@ -10,7 +10,7 @@ import { ITaskHistoryTemplateData } from 'sql/parts/taskHistory/viewlet/template import { TaskNode, TaskStatus } from 'sql/parts/taskHistory/common/taskNode'; import dom = require('vs/base/browser/dom'); import { localize } from 'vs/nls'; -import * as Utils from 'sql/parts/connection/common/utils'; +import * as Utils from 'sql/platform/connection/common/utils'; /** * Renders the tree items. diff --git a/src/sql/parts/taskHistory/viewlet/taskHistoryView.ts b/src/sql/parts/taskHistory/viewlet/taskHistoryView.ts index 176007b0af..8e58aafac7 100644 --- a/src/sql/parts/taskHistory/viewlet/taskHistoryView.ts +++ b/src/sql/parts/taskHistory/viewlet/taskHistoryView.ts @@ -20,9 +20,9 @@ import { TaskHistoryRenderer } from 'sql/parts/taskHistory/viewlet/taskHistoryRe import { TaskHistoryDataSource } from 'sql/parts/taskHistory/viewlet/taskHistoryDataSource'; import { TaskHistoryController } from 'sql/parts/taskHistory/viewlet/taskHistoryController'; import { TaskHistoryActionProvider } from 'sql/parts/taskHistory/viewlet/taskHistoryActionProvider'; -import { ITaskService } from 'sql/parts/taskHistory/common/taskService'; +import { ITaskService } from 'sql/platform/taskHistory/common/taskService'; import { TaskNode, TaskStatus } from 'sql/parts/taskHistory/common/taskNode'; -import { IErrorMessageService } from 'sql/parts/connection/common/connectionManagement'; +import { IErrorMessageService } from 'sql/platform/errorMessage/common/errorMessageService'; const $ = builder.$; diff --git a/src/sql/parts/taskHistory/viewlet/taskHistoryViewlet.ts b/src/sql/parts/taskHistory/viewlet/taskHistoryViewlet.ts index 4667432e65..63b4d576dc 100644 --- a/src/sql/parts/taskHistory/viewlet/taskHistoryViewlet.ts +++ b/src/sql/parts/taskHistory/viewlet/taskHistoryViewlet.ts @@ -15,7 +15,7 @@ import { IThemeService } from 'vs/platform/theme/common/themeService'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; import { isPromiseCanceledError } from 'vs/base/common/errors'; import Severity from 'vs/base/common/severity'; -import { IConnectionManagementService } from 'sql/parts/connection/common/connectionManagement'; +import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement'; import { TaskHistoryView } from 'sql/parts/taskHistory/viewlet/taskHistoryView'; import { IDisposable, dispose } from 'vs/base/common/lifecycle'; import { IPartService } from 'vs/workbench/services/part/common/partService'; diff --git a/src/sql/parts/tasks/dialog/taskDialog.component.ts b/src/sql/parts/tasks/dialog/taskDialog.component.ts index e373ff6199..f18e11b3bf 100644 --- a/src/sql/parts/tasks/dialog/taskDialog.component.ts +++ b/src/sql/parts/tasks/dialog/taskDialog.component.ts @@ -3,7 +3,7 @@ * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { ConnectionManagementInfo } from 'sql/parts/connection/common/connectionManagementInfo'; +import { ConnectionManagementInfo } from 'sql/platform/connection/common/connectionManagementInfo'; import { ITaskDialogComponent } from 'sql/parts/tasks/common/tasks'; import { ITaskDialogComponentParams } from 'sql/services/bootstrap/bootstrapParams'; import { ElementRef, Component, Inject, forwardRef } from '@angular/core'; @@ -24,10 +24,10 @@ export class TaskDialogComponent { public connection: ConnectionManagementInfo; constructor( - @Inject(forwardRef(() => ElementRef)) private _el: ElementRef, - @Inject(IBootstrapParams) private _parameters: ITaskDialogComponentParams - ) { - this.ownerUri = this._parameters.ownerUri; + @Inject(forwardRef(() => ElementRef)) private _el: ElementRef, + @Inject(IBootstrapParams) private _parameters: ITaskDialogComponentParams + ) { + this.ownerUri = this._parameters.ownerUri; } diff --git a/src/sql/parts/tasks/dialog/taskDialogInput.ts b/src/sql/parts/tasks/dialog/taskDialogInput.ts index 40583479b5..4d6ca2b408 100644 --- a/src/sql/parts/tasks/dialog/taskDialogInput.ts +++ b/src/sql/parts/tasks/dialog/taskDialogInput.ts @@ -6,7 +6,7 @@ import { TPromise } from 'vs/base/common/winjs.base'; import { EditorInput, EditorModel } from 'vs/workbench/common/editor'; import { UntitledEditorInput } from 'vs/workbench/common/editor/untitledEditorInput'; -import { IConnectionProfile } from 'sql/parts/connection/common/interfaces'; +import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; export class TaskDialogInput extends EditorInput { diff --git a/src/sql/parts/accountManagement/accountPicker/accountPicker.ts b/src/sql/platform/accountManagement/browser/accountPicker.ts similarity index 95% rename from src/sql/parts/accountManagement/accountPicker/accountPicker.ts rename to src/sql/platform/accountManagement/browser/accountPicker.ts index bb31cf05be..b5276d2617 100644 --- a/src/sql/parts/accountManagement/accountPicker/accountPicker.ts +++ b/src/sql/platform/accountManagement/browser/accountPicker.ts @@ -13,18 +13,18 @@ import { IDropdownOptions } from 'vs/base/browser/ui/dropdown/dropdown'; import { IListEvent } from 'vs/base/browser/ui/list/list'; import { IContextViewService } from 'vs/platform/contextview/browser/contextView'; import { buttonBackground } from 'vs/platform/theme/common/colorRegistry'; -import { IWorkbenchThemeService, IColorTheme } from 'vs/workbench/services/themes/common/workbenchThemeService'; import { attachListStyler } from 'vs/platform/theme/common/styler'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; 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 { DropdownList } from 'sql/base/browser/ui/dropdownList/dropdownList'; import { attachDropdownStyler } from 'sql/common/theme/styler'; import { AddAccountAction, RefreshAccountAction } from 'sql/parts/accountManagement/common/accountActions'; import { AccountPickerListRenderer, AccountListDelegate } from 'sql/parts/accountManagement/common/accountListRenderer'; -import { AccountPickerViewModel } from 'sql/parts/accountManagement/accountPicker/accountPickerViewModel'; +import { AccountPickerViewModel } from 'sql/platform/accountManagement/common/accountPickerViewModel'; export class AccountPicker extends Disposable { public static ACCOUNTPICKERLIST_HEIGHT = 47; @@ -51,7 +51,7 @@ export class AccountPicker extends Disposable { constructor( private _providerId: string, - @IWorkbenchThemeService private _themeService: IWorkbenchThemeService, + @IThemeService private _themeService: IThemeService, @IInstantiationService private _instantiationService: IInstantiationService, @IContextViewService private _contextViewService: IContextViewService ) { @@ -129,8 +129,8 @@ export class AccountPicker extends Disposable { new Builder(this._refreshContainer).hide(); } - this._register(this._themeService.onDidColorThemeChange(e => this.updateTheme(e))); - this.updateTheme(this._themeService.getColorTheme()); + this._register(this._themeService.onThemeChange(e => this.updateTheme(e))); + this.updateTheme(this._themeService.getTheme()); // Load the initial contents of the view model this.viewModel.initialize() @@ -227,7 +227,7 @@ export class AccountPicker extends Disposable { /** * Update theming that is specific to account picker */ - private updateTheme(theme: IColorTheme): void { + private updateTheme(theme: ITheme): void { let linkColor = theme.getColor(buttonBackground); let link = linkColor ? linkColor.toString() : null; this._refreshContainer.style.color = link; diff --git a/src/sql/parts/accountManagement/accountPicker/accountPickerService.ts b/src/sql/platform/accountManagement/browser/accountPickerService.ts similarity index 93% rename from src/sql/parts/accountManagement/accountPicker/accountPickerService.ts rename to src/sql/platform/accountManagement/browser/accountPickerService.ts index 58c54df2b1..efcb3f8d5f 100644 --- a/src/sql/parts/accountManagement/accountPicker/accountPickerService.ts +++ b/src/sql/platform/accountManagement/browser/accountPickerService.ts @@ -8,8 +8,8 @@ import { IInstantiationService } from 'vs/platform/instantiation/common/instanti import { Event, Emitter } from 'vs/base/common/event'; import * as sqlops from 'sqlops'; -import { IAccountPickerService } from 'sql/parts/accountManagement/common/interfaces'; -import { AccountPicker } from 'sql/parts/accountManagement/accountPicker/accountPicker'; +import { IAccountPickerService } from 'sql/platform/accountManagement/common/accountPicker'; +import { AccountPicker } from 'sql/platform/accountManagement/browser/accountPicker'; export class AccountPickerService implements IAccountPickerService { _serviceBrand: any; diff --git a/src/sql/parts/accountManagement/accountPicker/media/accountPicker.css b/src/sql/platform/accountManagement/browser/media/accountPicker.css similarity index 100% rename from src/sql/parts/accountManagement/accountPicker/media/accountPicker.css rename to src/sql/platform/accountManagement/browser/media/accountPicker.css diff --git a/src/sql/platform/accountManagement/common/accountPicker.ts b/src/sql/platform/accountManagement/common/accountPicker.ts new file mode 100644 index 0000000000..35f7403fc0 --- /dev/null +++ b/src/sql/platform/accountManagement/common/accountPicker.ts @@ -0,0 +1,22 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the Source EULA. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ + +'use strict'; + +import { createDecorator } from 'vs/platform/instantiation/common/instantiation'; +import { Event } from 'vs/base/common/event'; + +import * as sqlops from 'sqlops'; + +export const IAccountPickerService = createDecorator('AccountPickerService'); +export interface IAccountPickerService { + _serviceBrand: any; + renderAccountPicker(container: HTMLElement): void; + addAccountCompleteEvent: Event; + addAccountErrorEvent: Event; + addAccountStartEvent: Event; + onAccountSelectionChangeEvent: Event; + selectedAccount: sqlops.Account; +} diff --git a/src/sql/parts/accountManagement/accountPicker/accountPickerViewModel.ts b/src/sql/platform/accountManagement/common/accountPickerViewModel.ts similarity index 90% rename from src/sql/parts/accountManagement/accountPicker/accountPickerViewModel.ts rename to src/sql/platform/accountManagement/common/accountPickerViewModel.ts index 065dfae127..f08a888251 100644 --- a/src/sql/parts/accountManagement/accountPicker/accountPickerViewModel.ts +++ b/src/sql/platform/accountManagement/common/accountPickerViewModel.ts @@ -7,8 +7,8 @@ import * as sqlops from 'sqlops'; import { Event, Emitter } from 'vs/base/common/event'; -import { IAccountManagementService } from 'sql/services/accountManagement/interfaces'; -import { UpdateAccountListEventParams } from 'sql/services/accountManagement/eventTypes'; +import { IAccountManagementService } from 'sql/platform/accountManagement/common/interfaces'; +import { UpdateAccountListEventParams } from 'sql/platform/accountManagement/common/eventTypes'; /** * View model for account picker diff --git a/src/sql/services/accountManagement/accountStore.ts b/src/sql/platform/accountManagement/common/accountStore.ts similarity index 97% rename from src/sql/services/accountManagement/accountStore.ts rename to src/sql/platform/accountManagement/common/accountStore.ts index 6a20032ce4..d5c08d035b 100644 --- a/src/sql/services/accountManagement/accountStore.ts +++ b/src/sql/platform/accountManagement/common/accountStore.ts @@ -6,8 +6,8 @@ 'use strict'; import * as sqlops from 'sqlops'; -import { AccountAdditionResult } from 'sql/services/accountManagement/eventTypes'; -import { IAccountStore } from 'sql/services/accountManagement/interfaces'; +import { AccountAdditionResult } from 'sql/platform/accountManagement/common/eventTypes'; +import { IAccountStore } from 'sql/platform/accountManagement/common/interfaces'; export default class AccountStore implements IAccountStore { // CONSTANTS /////////////////////////////////////////////////////////// diff --git a/src/sql/services/accountManagement/eventTypes.ts b/src/sql/platform/accountManagement/common/eventTypes.ts similarity index 100% rename from src/sql/services/accountManagement/eventTypes.ts rename to src/sql/platform/accountManagement/common/eventTypes.ts diff --git a/src/sql/services/accountManagement/interfaces.ts b/src/sql/platform/accountManagement/common/interfaces.ts similarity index 97% rename from src/sql/services/accountManagement/interfaces.ts rename to src/sql/platform/accountManagement/common/interfaces.ts index 206f31b0f2..411a6e1e0d 100644 --- a/src/sql/services/accountManagement/interfaces.ts +++ b/src/sql/platform/accountManagement/common/interfaces.ts @@ -7,7 +7,7 @@ import * as sqlops from 'sqlops'; import { Event } from 'vs/base/common/event'; -import { AccountAdditionResult, AccountProviderAddedEventParams, UpdateAccountListEventParams } from 'sql/services/accountManagement/eventTypes'; +import { AccountAdditionResult, AccountProviderAddedEventParams, UpdateAccountListEventParams } from 'sql/platform/accountManagement/common/eventTypes'; import { createDecorator } from 'vs/platform/instantiation/common/instantiation'; export const SERVICE_ID = 'accountManagementService'; diff --git a/src/sql/services/angularEventing/angularEventingService.ts b/src/sql/platform/angularEventing/common/angularEventingService.ts similarity index 63% rename from src/sql/services/angularEventing/angularEventingService.ts rename to src/sql/platform/angularEventing/common/angularEventingService.ts index 86f8773c6f..d7732b0662 100644 --- a/src/sql/services/angularEventing/angularEventingService.ts +++ b/src/sql/platform/angularEventing/common/angularEventingService.ts @@ -5,8 +5,6 @@ import { createDecorator } from 'vs/platform/instantiation/common/instantiation'; import { Subscription } from 'rxjs/Subscription'; -import { Subject } from 'rxjs/Subject'; -import { warn } from 'sql/base/common/log'; const ANGULAREVENTING_SERVICE_ID = 'angularEventingService'; export const IAngularEventingService = createDecorator(ANGULAREVENTING_SERVICE_ID); @@ -47,28 +45,3 @@ export interface IAngularEventingService { */ sendAngularEvent(uri: string, event: AngularEventType, payload?: any): void; } - -export class AngularEventingService implements IAngularEventingService { - public _serviceBrand: any; - private _angularMap = new Map>(); - - public onAngularEvent(uri: string, cb: (event: IAngularEvent) => void): Subscription { - let subject: Subject; - if (!this._angularMap.has(uri)) { - subject = new Subject(); - this._angularMap.set(uri, subject); - } else { - subject = this._angularMap.get(uri); - } - let sub = subject.subscribe(cb); - return sub; - } - - public sendAngularEvent(uri: string, event: AngularEventType, payload?: any): void { - if (!this._angularMap.has(uri)) { - warn('Got request to send an event to a dashboard that has not started listening'); - } else { - this._angularMap.get(uri).next({ event, payload }); - } - } -} diff --git a/src/sql/platform/angularEventing/node/angularEventingService.ts b/src/sql/platform/angularEventing/node/angularEventingService.ts new file mode 100644 index 0000000000..836e103700 --- /dev/null +++ b/src/sql/platform/angularEventing/node/angularEventingService.ts @@ -0,0 +1,35 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the Source EULA. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ + +import { Subject } from 'rxjs/Subject'; +import { Subscription } from 'rxjs/Subscription'; + +import { warn } from 'sql/base/common/log'; +import { IAngularEventingService, IAngularEvent, AngularEventType } from 'sql/platform/angularEventing/common/angularEventingService'; + +export class AngularEventingService implements IAngularEventingService { + public _serviceBrand: any; + private _angularMap = new Map>(); + + public onAngularEvent(uri: string, cb: (event: IAngularEvent) => void): Subscription { + let subject: Subject; + if (!this._angularMap.has(uri)) { + subject = new Subject(); + this._angularMap.set(uri, subject); + } else { + subject = this._angularMap.get(uri); + } + let sub = subject.subscribe(cb); + return sub; + } + + public sendAngularEvent(uri: string, event: AngularEventType, payload?: any): void { + if (!this._angularMap.has(uri)) { + warn('Got request to send an event to a dashboard that has not started listening'); + } else { + this._angularMap.get(uri).next({ event, payload }); + } + } +} diff --git a/src/sql/parts/disasterRecovery/backup/common/backupService.ts b/src/sql/platform/backup/common/backupService.ts similarity index 91% rename from src/sql/parts/disasterRecovery/backup/common/backupService.ts rename to src/sql/platform/backup/common/backupService.ts index dc8fc5bb18..2e8ddbf271 100644 --- a/src/sql/parts/disasterRecovery/backup/common/backupService.ts +++ b/src/sql/platform/backup/common/backupService.ts @@ -9,9 +9,7 @@ import { createDecorator } from 'vs/platform/instantiation/common/instantiation' import { Event } from 'vs/base/common/event'; import * as sqlops from 'sqlops'; -import { IDashboardComponentParams } from 'sql/services/bootstrap/bootstrapParams'; -import { IConnectionProfile } from 'sql/parts/connection/common/interfaces'; - +import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; export enum TaskExecutionMode { execute = 0, diff --git a/src/sql/platform/backup/common/backupServiceImp.ts b/src/sql/platform/backup/common/backupServiceImp.ts new file mode 100644 index 0000000000..aa28ff673a --- /dev/null +++ b/src/sql/platform/backup/common/backupServiceImp.ts @@ -0,0 +1,74 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the Source EULA. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ + +'use strict'; +import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement'; +import * as sqlops from 'sqlops'; +import * as Constants from 'sql/common/constants'; +import * as TelemetryKeys from 'sql/common/telemetryKeys'; +import * as TelemetryUtils from 'sql/common/telemetryUtilities'; +import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry'; +import { IBackupService, TaskExecutionMode } from 'sql/platform/backup/common/backupService'; + +export class BackupService implements IBackupService { + + public _serviceBrand: any; + private _providers: { [handle: string]: sqlops.BackupProvider; } = Object.create(null); + + constructor( + @IConnectionManagementService private _connectionService: IConnectionManagementService, + @ITelemetryService private _telemetryService: ITelemetryService + ) { + } + + /** + * Get database metadata needed to populate backup UI + */ + public getBackupConfigInfo(connectionUri: string): Thenable { + let providerId: string = this._connectionService.getProviderIdFromUri(connectionUri); + if (providerId) { + let provider = this._providers[providerId]; + if (provider) { + return provider.getBackupConfigInfo(connectionUri); + } + } + return Promise.resolve(undefined); + } + + /** + * Backup a data source using the provided connection + */ + public backup(connectionUri: string, backupInfo: { [key: string]: any }, taskExecutionMode: TaskExecutionMode): Thenable { + return new Promise((resolve, reject) => { + let providerResult = this.getProvider(connectionUri); + if (providerResult) { + TelemetryUtils.addTelemetry(this._telemetryService, TelemetryKeys.BackupCreated, { provider: providerResult.providerName }); + providerResult.provider.backup(connectionUri, backupInfo, taskExecutionMode).then(result => { + resolve(result); + }, error => { + reject(error); + }); + } else { + reject(Constants.InvalidProvider); + } + }); + } + + private getProvider(connectionUri: string): { provider: sqlops.BackupProvider, providerName: string } { + let providerId: string = this._connectionService.getProviderIdFromUri(connectionUri); + if (providerId) { + return { provider: this._providers[providerId], providerName: providerId }; + } else { + return undefined; + } + } + + /** + * Register a disaster recovery provider + */ + public registerProvider(providerId: string, provider: sqlops.BackupProvider): void { + this._providers[providerId] = provider; + } +} diff --git a/src/sql/services/capabilities/capabilitiesService.ts b/src/sql/platform/capabilities/common/capabilitiesService.ts similarity index 97% rename from src/sql/services/capabilities/capabilitiesService.ts rename to src/sql/platform/capabilities/common/capabilitiesService.ts index a5298908de..56796ed460 100644 --- a/src/sql/services/capabilities/capabilitiesService.ts +++ b/src/sql/platform/capabilities/common/capabilitiesService.ts @@ -5,9 +5,8 @@ 'use strict'; -import { ConnectionManagementInfo } from 'sql/parts/connection/common/connectionManagementInfo'; +import { ConnectionManagementInfo } from 'sql/platform/connection/common/connectionManagementInfo'; import * as Constants from 'sql/common/constants'; -import { Deferred } from 'sql/base/common/promise'; import { ConnectionProviderProperties, IConnectionProviderRegistry, Extensions as ConnectionExtensions } from 'sql/workbench/parts/connection/common/connectionProviderExtension'; import { toObject } from 'sql/base/common/map'; @@ -17,7 +16,7 @@ import { Event, Emitter } from 'vs/base/common/event'; import { IAction } from 'vs/base/common/actions'; import { Memento } from 'vs/workbench/common/memento'; import { createDecorator } from 'vs/platform/instantiation/common/instantiation'; -import { IDisposable, dispose, Disposable } from 'vs/base/common/lifecycle'; +import { Disposable } from 'vs/base/common/lifecycle'; import { IStorageService } from 'vs/platform/storage/common/storage'; import { Registry } from 'vs/platform/registry/common/platform'; import { IExtensionManagementService } from 'vs/platform/extensionManagement/common/extensionManagement'; diff --git a/src/sql/parts/connection/common/connectionConfig.ts b/src/sql/platform/connection/common/connectionConfig.ts similarity index 99% rename from src/sql/parts/connection/common/connectionConfig.ts rename to src/sql/platform/connection/common/connectionConfig.ts index 5d94f9dd85..149e337316 100644 --- a/src/sql/parts/connection/common/connectionConfig.ts +++ b/src/sql/platform/connection/common/connectionConfig.ts @@ -13,7 +13,7 @@ import { ConfigurationEditingService, IConfigurationValue } from 'vs/workbench/s import { IWorkspaceConfigurationService } from 'vs/workbench/services/configuration/common/configuration'; import { ConfigurationTarget } from 'vs/platform/configuration/common/configuration'; import { ConnectionProfile } from './connectionProfile'; -import { ICapabilitiesService } from 'sql/services/capabilities/capabilitiesService'; +import { ICapabilitiesService } from 'sql/platform/capabilities/common/capabilitiesService'; import * as sqlops from 'sqlops'; import * as nls from 'vs/nls'; diff --git a/src/sql/parts/connection/common/connectionInfo.ts b/src/sql/platform/connection/common/connectionInfo.ts similarity index 100% rename from src/sql/parts/connection/common/connectionInfo.ts rename to src/sql/platform/connection/common/connectionInfo.ts diff --git a/src/sql/parts/connection/common/connectionManagement.ts b/src/sql/platform/connection/common/connectionManagement.ts similarity index 89% rename from src/sql/parts/connection/common/connectionManagement.ts rename to src/sql/platform/connection/common/connectionManagement.ts index cb0f08f630..274934be0f 100644 --- a/src/sql/parts/connection/common/connectionManagement.ts +++ b/src/sql/platform/connection/common/connectionManagement.ts @@ -5,24 +5,17 @@ 'use strict'; -import { IViewlet } from 'vs/workbench/common/viewlet'; import { createDecorator } from 'vs/platform/instantiation/common/instantiation'; -import { TPromise } from 'vs/base/common/winjs.base'; import { Event } from 'vs/base/common/event'; -import { IAction } from 'vs/base/common/actions'; -import Severity from 'vs/base/common/severity'; import * as sqlops from 'sqlops'; -import { IConnectionProfileGroup, ConnectionProfileGroup } from 'sql/parts/connection/common/connectionProfileGroup'; -import { ConnectionProfile } from 'sql/parts/connection/common/connectionProfile'; -import { IConnectionProfile } from 'sql/parts/connection/common/interfaces'; +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'; import { ConnectionManagementInfo } from './connectionManagementInfo'; +import { IServerGroupDialogCallbacks } from 'sql/platform/serverGroup/common/serverGroupController'; export const VIEWLET_ID = 'workbench.view.connections'; -export interface IConnectionsViewlet extends IViewlet { - search(text: string): void; -} - /** * Options for the actions that could happen after connecting is complete */ @@ -297,23 +290,6 @@ export interface IConnectionDialogService { openDialogAndWait(connectionManagementService: IConnectionManagementService, params?: INewConnectionParams, model?: IConnectionProfile, connectionResult?: IConnectionResult): Thenable; } -export interface IServerGroupDialogCallbacks { - onAddGroup(groupName: string): void; - onClose(): void; -} -export const IServerGroupController = createDecorator('serverGroupController'); -export interface IServerGroupController { - _serviceBrand: any; - showCreateGroupDialog(connectionManagementService: IConnectionManagementService, callbacks?: IServerGroupDialogCallbacks): TPromise; - showEditGroupDialog(connectionManagementService: IConnectionManagementService, group: ConnectionProfileGroup): TPromise; -} - -export const IErrorMessageService = createDecorator('errorMessageService'); -export interface IErrorMessageService { - _serviceBrand: any; - showDialog(severity: Severity, headerTitle: string, message: string, messageDetails?: string, actions?: IAction[]): void; -} - export enum RunQueryOnConnectionMode { none = 0, executeQuery = 1, diff --git a/src/sql/parts/connection/common/connectionManagementInfo.ts b/src/sql/platform/connection/common/connectionManagementInfo.ts similarity index 95% rename from src/sql/parts/connection/common/connectionManagementInfo.ts rename to src/sql/platform/connection/common/connectionManagementInfo.ts index 478a0bd67b..a18c3dab42 100644 --- a/src/sql/parts/connection/common/connectionManagementInfo.ts +++ b/src/sql/platform/connection/common/connectionManagementInfo.ts @@ -5,7 +5,7 @@ 'use strict'; -import { ConnectionProfile } from 'sql/parts/connection/common/connectionProfile'; +import { ConnectionProfile } from 'sql/platform/connection/common/connectionProfile'; import * as sqlops from 'sqlops'; import { StopWatch } from 'vs/base/common/stopwatch'; diff --git a/src/sql/parts/connection/common/connectionManagementService.ts b/src/sql/platform/connection/common/connectionManagementService.ts similarity index 97% rename from src/sql/parts/connection/common/connectionManagementService.ts rename to src/sql/platform/connection/common/connectionManagementService.ts index 2674f9d2d9..9a346e9610 100644 --- a/src/sql/parts/connection/common/connectionManagementService.ts +++ b/src/sql/platform/connection/common/connectionManagementService.ts @@ -4,37 +4,37 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; -import { ConnectionProfile } from 'sql/parts/connection/common/connectionProfile'; +import { ConnectionProfile } from 'sql/platform/connection/common/connectionProfile'; import * as WorkbenchUtils from 'sql/workbench/common/sqlWorkbenchUtils'; import { IConnectionManagementService, IConnectionDialogService, INewConnectionParams, ConnectionType, IConnectableInput, IConnectionCompletionOptions, IConnectionCallbacks, - IConnectionParams, IConnectionResult, IServerGroupController, IServerGroupDialogCallbacks, - RunQueryOnConnectionMode -} from 'sql/parts/connection/common/connectionManagement'; -import { ConnectionStore } from 'sql/parts/connection/common/connectionStore'; -import { IConnectionProfile } from 'sql/parts/connection/common/interfaces'; -import { ConnectionManagementInfo } from 'sql/parts/connection/common/connectionManagementInfo'; -import * as Utils from 'sql/parts/connection/common/utils'; -import * as Constants from 'sql/parts/connection/common/constants'; -import { ICapabilitiesService } from 'sql/services/capabilities/capabilitiesService'; -import { ICredentialsService } from 'sql/services/credentials/credentialsService'; + IConnectionParams, IConnectionResult, RunQueryOnConnectionMode +} from 'sql/platform/connection/common/connectionManagement'; +import { ConnectionStore } from 'sql/platform/connection/common/connectionStore'; +import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; +import { ConnectionManagementInfo } from 'sql/platform/connection/common/connectionManagementInfo'; +import * as Utils from 'sql/platform/connection/common/utils'; +import * as Constants from 'sql/platform/connection/common/constants'; +import { ICapabilitiesService } from 'sql/platform/capabilities/common/capabilitiesService'; +import { ICredentialsService } from 'sql/platform/credentials/common/credentialsService'; import * as ConnectionContracts from 'sql/parts/connection/common/connection'; -import { ConnectionStatusManager } from 'sql/parts/connection/common/connectionStatusManager'; +import { ConnectionStatusManager } from 'sql/platform/connection/common/connectionStatusManager'; import { DashboardInput } from 'sql/parts/dashboard/dashboardInput'; import { ConnectionGlobalStatus } from 'sql/parts/connection/common/connectionGlobalStatus'; import { ConnectionStatusbarItem } from 'sql/parts/connection/common/connectionStatus'; import * as TelemetryKeys from 'sql/common/telemetryKeys'; import * as TelemetryUtils from 'sql/common/telemetryUtilities'; import { warn } from 'sql/base/common/log'; -import { IResourceProviderService } from 'sql/parts/accountManagement/common/interfaces'; -import { IAngularEventingService, AngularEventType } from 'sql/services/angularEventing/angularEventingService'; +import { IResourceProviderService } from 'sql/workbench/services/resourceProvider/common/resourceProviderService'; +import { IAngularEventingService, AngularEventType } from 'sql/platform/angularEventing/common/angularEventingService'; import * as QueryConstants from 'sql/parts/query/common/constants'; import { Deferred } from 'sql/base/common/promise'; import { ConnectionOptionSpecialType } from 'sql/workbench/api/common/sqlExtHostTypes'; import { values } from 'sql/base/common/objects'; import { ConnectionProviderProperties, IConnectionProviderRegistry, Extensions as ConnectionProviderExtensions } from 'sql/workbench/parts/connection/common/connectionProviderExtension'; -import { IAccountManagementService, AzureResource } from 'sql/services/accountManagement/interfaces'; +import { IAccountManagementService, AzureResource } from 'sql/platform/accountManagement/common/interfaces'; +import { IServerGroupController, IServerGroupDialogCallbacks } from 'sql/platform/serverGroup/common/serverGroupController'; import * as sqlops from 'sqlops'; @@ -48,7 +48,7 @@ import { Memento } from 'vs/workbench/common/memento'; import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry'; import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace'; import { IStorageService } from 'vs/platform/storage/common/storage'; -import { ConnectionProfileGroup, IConnectionProfileGroup } from './connectionProfileGroup'; +import { ConnectionProfileGroup, IConnectionProfileGroup } from 'sql/platform/connection/common/connectionProfileGroup'; import { ConfigurationEditingService } from 'vs/workbench/services/configuration/node/configurationEditingService'; import { IWorkspaceConfigurationService } from 'vs/workbench/services/configuration/common/configuration'; import { IQuickOpenService } from 'vs/platform/quickOpen/common/quickOpen'; diff --git a/src/sql/parts/connection/common/connectionProfile.ts b/src/sql/platform/connection/common/connectionProfile.ts similarity index 96% rename from src/sql/parts/connection/common/connectionProfile.ts rename to src/sql/platform/connection/common/connectionProfile.ts index acd1d4b0b1..bd5c571160 100644 --- a/src/sql/parts/connection/common/connectionProfile.ts +++ b/src/sql/platform/connection/common/connectionProfile.ts @@ -7,12 +7,12 @@ import { ConnectionProfileGroup } from './connectionProfileGroup'; import * as sqlops from 'sqlops'; -import { ProviderConnectionInfo } from 'sql/parts/connection/common/providerConnectionInfo'; -import * as interfaces from 'sql/parts/connection/common/interfaces'; +import { ProviderConnectionInfo } from 'sql/platform/connection/common/providerConnectionInfo'; +import * as interfaces from 'sql/platform/connection/common/interfaces'; import { equalsIgnoreCase } from 'vs/base/common/strings'; import { generateUuid } from 'vs/base/common/uuid'; import * as objects from 'sql/base/common/objects'; -import { ICapabilitiesService } from 'sql/services/capabilities/capabilitiesService'; +import { ICapabilitiesService } from 'sql/platform/capabilities/common/capabilitiesService'; import { isString } from 'vs/base/common/types'; // Concrete implementation of the IConnectionProfile interface diff --git a/src/sql/parts/connection/common/connectionProfileGroup.ts b/src/sql/platform/connection/common/connectionProfileGroup.ts similarity index 100% rename from src/sql/parts/connection/common/connectionProfileGroup.ts rename to src/sql/platform/connection/common/connectionProfileGroup.ts diff --git a/src/sql/parts/connection/common/connectionStatusManager.ts b/src/sql/platform/connection/common/connectionStatusManager.ts similarity index 97% rename from src/sql/parts/connection/common/connectionStatusManager.ts rename to src/sql/platform/connection/common/connectionStatusManager.ts index 6ec7b3b9b5..bd5d99b579 100644 --- a/src/sql/parts/connection/common/connectionStatusManager.ts +++ b/src/sql/platform/connection/common/connectionStatusManager.ts @@ -5,8 +5,8 @@ 'use strict'; import { ConnectionManagementInfo } from './connectionManagementInfo'; -import { ICapabilitiesService } from 'sql/services/capabilities/capabilitiesService'; -import { ConnectionProfile } from 'sql/parts/connection/common/connectionProfile'; +import { ICapabilitiesService } from 'sql/platform/capabilities/common/capabilitiesService'; +import { ConnectionProfile } from 'sql/platform/connection/common/connectionProfile'; import { IConnectionProfile } from './interfaces'; import * as Utils from './utils'; import * as sqlops from 'sqlops'; diff --git a/src/sql/parts/connection/common/connectionStore.ts b/src/sql/platform/connection/common/connectionStore.ts similarity index 98% rename from src/sql/parts/connection/common/connectionStore.ts rename to src/sql/platform/connection/common/connectionStore.ts index 5a8bd93d22..0f0730e79f 100644 --- a/src/sql/parts/connection/common/connectionStore.ts +++ b/src/sql/platform/connection/common/connectionStore.ts @@ -8,8 +8,8 @@ import * as Constants from './constants'; import * as ConnInfo from './connectionInfo'; import { ConnectionProfile } from '../common/connectionProfile'; -import { IConnectionProfile } from 'sql/parts/connection/common/interfaces'; -import { ICredentialsService } from 'sql/services/credentials/credentialsService'; +import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; +import { ICredentialsService } from 'sql/platform/credentials/common/credentialsService'; import { IConnectionConfig } from './iconnectionConfig'; import { ConnectionConfig } from './connectionConfig'; import { Memento, Scope as MementoScope } from 'vs/workbench/common/memento'; @@ -17,7 +17,7 @@ import { IStorageService } from 'vs/platform/storage/common/storage'; import { ConnectionProfileGroup, IConnectionProfileGroup } from './connectionProfileGroup'; import { ConfigurationEditingService } from 'vs/workbench/services/configuration/node/configurationEditingService'; import { IWorkspaceConfigurationService } from 'vs/workbench/services/configuration/common/configuration'; -import { ICapabilitiesService } from 'sql/services/capabilities/capabilitiesService'; +import { ICapabilitiesService } from 'sql/platform/capabilities/common/capabilitiesService'; import { ConnectionOptionSpecialType } from 'sql/workbench/api/common/sqlExtHostTypes'; import * as sqlops from 'sqlops'; diff --git a/src/sql/parts/connection/common/constants.ts b/src/sql/platform/connection/common/constants.ts similarity index 100% rename from src/sql/parts/connection/common/constants.ts rename to src/sql/platform/connection/common/constants.ts diff --git a/src/sql/parts/connection/common/iconnectionConfig.ts b/src/sql/platform/connection/common/iconnectionConfig.ts similarity index 100% rename from src/sql/parts/connection/common/iconnectionConfig.ts rename to src/sql/platform/connection/common/iconnectionConfig.ts diff --git a/src/sql/parts/connection/common/interfaces.ts b/src/sql/platform/connection/common/interfaces.ts similarity index 100% rename from src/sql/parts/connection/common/interfaces.ts rename to src/sql/platform/connection/common/interfaces.ts diff --git a/src/sql/parts/connection/common/providerConnectionInfo.ts b/src/sql/platform/connection/common/providerConnectionInfo.ts similarity index 97% rename from src/sql/parts/connection/common/providerConnectionInfo.ts rename to src/sql/platform/connection/common/providerConnectionInfo.ts index 45165a10d9..133effdf8d 100644 --- a/src/sql/parts/connection/common/providerConnectionInfo.ts +++ b/src/sql/platform/connection/common/providerConnectionInfo.ts @@ -9,10 +9,9 @@ import { Disposable } from 'vs/base/common/lifecycle'; import { isString } from 'vs/base/common/types'; import * as sqlops from 'sqlops'; -import * as interfaces from 'sql/parts/connection/common/interfaces'; import { ConnectionOptionSpecialType, ServiceOptionType } from 'sql/workbench/api/common/sqlExtHostTypes'; -import * as Constants from 'sql/parts/connection/common/constants'; -import { ICapabilitiesService } from 'sql/services/capabilities/capabilitiesService'; +import * as Constants from 'sql/platform/connection/common/constants'; +import { ICapabilitiesService } from 'sql/platform/capabilities/common/capabilitiesService'; import { ConnectionProviderProperties } from 'sql/workbench/parts/connection/common/connectionProviderExtension'; export class ProviderConnectionInfo extends Disposable implements sqlops.ConnectionInfo { diff --git a/src/sql/parts/connection/common/utils.ts b/src/sql/platform/connection/common/utils.ts similarity index 100% rename from src/sql/parts/connection/common/utils.ts rename to src/sql/platform/connection/common/utils.ts diff --git a/src/sql/services/credentials/credentialsService.ts b/src/sql/platform/credentials/common/credentialsService.ts similarity index 100% rename from src/sql/services/credentials/credentialsService.ts rename to src/sql/platform/credentials/common/credentialsService.ts diff --git a/src/sql/services/dacfx/dacFxService.ts b/src/sql/platform/dacfx/common/dacFxService.ts similarity index 95% rename from src/sql/services/dacfx/dacFxService.ts rename to src/sql/platform/dacfx/common/dacFxService.ts index 231071724d..c9277f301b 100644 --- a/src/sql/services/dacfx/dacFxService.ts +++ b/src/sql/platform/dacfx/common/dacFxService.ts @@ -7,10 +7,9 @@ import * as sqlops from 'sqlops'; import { createDecorator } from 'vs/platform/instantiation/common/instantiation'; -import { IConnectionManagementService } from 'sql/parts/connection/common/connectionManagement'; +import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement'; import { TPromise } from 'vs/base/common/winjs.base'; import { localize } from 'vs/nls'; -import { data } from 'vs/base/test/common/filters.perf.data'; export const SERVICE_ID = 'dacFxService'; export const IDacFxService = createDecorator(SERVICE_ID); diff --git a/src/sql/services/dashboard/common/dashboardService.ts b/src/sql/platform/dashboard/browser/dashboardService.ts similarity index 100% rename from src/sql/services/dashboard/common/dashboardService.ts rename to src/sql/platform/dashboard/browser/dashboardService.ts diff --git a/src/sql/services/dashboard/common/dashboardServiceImpl.ts b/src/sql/platform/dashboard/browser/dashboardServiceImpl.ts similarity index 100% rename from src/sql/services/dashboard/common/dashboardServiceImpl.ts rename to src/sql/platform/dashboard/browser/dashboardServiceImpl.ts diff --git a/src/sql/services/dashboard/common/dashboardViewService.ts b/src/sql/platform/dashboard/common/dashboardViewService.ts similarity index 83% rename from src/sql/services/dashboard/common/dashboardViewService.ts rename to src/sql/platform/dashboard/common/dashboardViewService.ts index eb0ad98735..8640a6dd41 100644 --- a/src/sql/services/dashboard/common/dashboardViewService.ts +++ b/src/sql/platform/dashboard/common/dashboardViewService.ts @@ -8,9 +8,7 @@ import { createDecorator } from 'vs/platform/instantiation/common/instantiation'; import { Event } from 'vs/base/common/event'; -import * as sqlops from 'sqlops'; -import { IItemConfig, IComponentShape } from 'sql/workbench/api/common/sqlExtHostTypes'; -import { IView, IModelView } from 'sql/services/model/modelViewService'; +import { IView, IModelView } from 'sql/platform/model/common/modelViewService'; export const SERVICE_ID = 'dashboardViewService'; diff --git a/src/sql/services/dashboard/common/dashboardViewServiceImpl.ts b/src/sql/platform/dashboard/common/dashboardViewServiceImpl.ts similarity index 84% rename from src/sql/services/dashboard/common/dashboardViewServiceImpl.ts rename to src/sql/platform/dashboard/common/dashboardViewServiceImpl.ts index d8920e00e5..3e2558cfa2 100644 --- a/src/sql/services/dashboard/common/dashboardViewServiceImpl.ts +++ b/src/sql/platform/dashboard/common/dashboardViewServiceImpl.ts @@ -5,9 +5,9 @@ 'use strict'; -import { IDashboardViewService, IDashboardWebview } from 'sql/services/dashboard/common/dashboardViewService'; +import { IDashboardViewService, IDashboardWebview } from 'sql/platform/dashboard/common/dashboardViewService'; import { Event, Emitter } from 'vs/base/common/event'; -import { IModelView } from 'sql/services/model/modelViewService'; +import { IModelView } from 'sql/platform/model/common/modelViewService'; export class DashboardViewService implements IDashboardViewService { _serviceBrand: any; diff --git a/src/sql/platform/errorMessage/common/errorMessageService.ts b/src/sql/platform/errorMessage/common/errorMessageService.ts new file mode 100644 index 0000000000..df30a18b29 --- /dev/null +++ b/src/sql/platform/errorMessage/common/errorMessageService.ts @@ -0,0 +1,16 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the Source EULA. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ + +'use strict'; + +import Severity from 'vs/base/common/severity'; +import { IAction } from 'vs/base/common/actions'; +import { createDecorator } from 'vs/platform/instantiation/common/instantiation'; + +export const IErrorMessageService = createDecorator('errorMessageService'); +export interface IErrorMessageService { + _serviceBrand: any; + showDialog(severity: Severity, headerTitle: string, message: string, messageDetails?: string, actions?: IAction[]): void; +} diff --git a/src/sql/parts/fileBrowser/common/fileBrowserService.ts b/src/sql/platform/fileBrowser/common/fileBrowserService.ts similarity index 95% rename from src/sql/parts/fileBrowser/common/fileBrowserService.ts rename to src/sql/platform/fileBrowser/common/fileBrowserService.ts index c2698246d2..f43914faa4 100644 --- a/src/sql/parts/fileBrowser/common/fileBrowserService.ts +++ b/src/sql/platform/fileBrowser/common/fileBrowserService.ts @@ -6,16 +6,16 @@ 'use strict'; import * as sqlops from 'sqlops'; -import { IConnectionManagementService, IErrorMessageService } from 'sql/parts/connection/common/connectionManagement'; +import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement'; import { FileBrowserTree } from 'sql/parts/fileBrowser/common/fileBrowserTree'; import { FileNode } from 'sql/parts/fileBrowser/common/fileNode'; -import { IFileBrowserService } from 'sql/parts/fileBrowser/common/interfaces'; +import { IFileBrowserService } from 'sql/platform/fileBrowser/common/interfaces'; import * as Constants from 'sql/common/constants'; +import { IErrorMessageService } from 'sql/platform/errorMessage/common/errorMessageService'; import { Event, Emitter } from 'vs/base/common/event'; import Severity from 'vs/base/common/severity'; import { localize } from 'vs/nls'; -import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; import * as strings from 'vs/base/common/strings'; export class FileBrowserService implements IFileBrowserService { @@ -29,7 +29,6 @@ export class FileBrowserService implements IFileBrowserService { static fileNodeId: number = 0; constructor( @IConnectionManagementService private _connectionService: IConnectionManagementService, - @IInstantiationService private _instantiationService: IInstantiationService, @IErrorMessageService private _errorMessageService: IErrorMessageService) { } diff --git a/src/sql/parts/fileBrowser/common/interfaces.ts b/src/sql/platform/fileBrowser/common/interfaces.ts similarity index 100% rename from src/sql/parts/fileBrowser/common/interfaces.ts rename to src/sql/platform/fileBrowser/common/interfaces.ts diff --git a/src/sql/parts/jobManagement/common/interfaces.ts b/src/sql/platform/jobManagement/common/interfaces.ts similarity index 95% rename from src/sql/parts/jobManagement/common/interfaces.ts rename to src/sql/platform/jobManagement/common/interfaces.ts index eee4a79997..a51b24b274 100644 --- a/src/sql/parts/jobManagement/common/interfaces.ts +++ b/src/sql/platform/jobManagement/common/interfaces.ts @@ -40,9 +40,9 @@ export interface IJobManagementService { jobAction(connectionUri: string, jobName: string, action: string): Thenable; addToCache(server: string, cache: JobCacheObject | OperatorsCacheObject); - jobCacheObjectMap: { [server: string]: JobCacheObject; }; + jobCacheObjectMap: { [server: string]: JobCacheObject; }; operatorsCacheObjectMap: { [server: string]: OperatorsCacheObject; }; alertsCacheObjectMap: { [server: string]: AlertsCacheObject; }; - proxiesCacheObjectMap: {[server: string]: ProxiesCacheObject }; + proxiesCacheObjectMap: { [server: string]: ProxiesCacheObject }; addToCache(server: string, cache: JobCacheObject | ProxiesCacheObject | AlertsCacheObject | OperatorsCacheObject); } \ No newline at end of file diff --git a/src/sql/parts/jobManagement/common/jobActions.ts b/src/sql/platform/jobManagement/common/jobActions.ts similarity index 97% rename from src/sql/parts/jobManagement/common/jobActions.ts rename to src/sql/platform/jobManagement/common/jobActions.ts index 3a253cfe0f..9e98e83533 100644 --- a/src/sql/parts/jobManagement/common/jobActions.ts +++ b/src/sql/platform/jobManagement/common/jobActions.ts @@ -12,14 +12,14 @@ import Severity from 'vs/base/common/severity'; import { JobHistoryComponent } from 'sql/parts/jobManagement/views/jobHistory.component'; import { IJobManagementService } from '../common/interfaces'; import { ICommandService } from 'vs/platform/commands/common/commands'; -import { JobsViewComponent } from '../views/jobsView.component'; +import { JobsViewComponent } from 'sql/parts/jobManagement/views/jobsView.component'; import { AlertsViewComponent } from 'sql/parts/jobManagement/views/alertsView.component'; import { OperatorsViewComponent } from 'sql/parts/jobManagement/views/operatorsView.component'; import { ProxiesViewComponent } from 'sql/parts/jobManagement/views/proxiesView.component'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry'; import * as TelemetryKeys from 'sql/common/telemetryKeys'; -import { IErrorMessageService } from 'sql/parts/connection/common/connectionManagement'; +import { IErrorMessageService } from 'sql/platform/errorMessage/common/errorMessageService'; export const successLabel: string = nls.localize('jobaction.successLabel', 'Success'); export const errorLabel: string = nls.localize('jobaction.faillabel', 'Error'); @@ -163,8 +163,8 @@ export class EditJobAction extends Action { public run(actionInfo: IJobActionInfo): TPromise { this._commandService.executeCommand( 'agent.openJobDialog', - actionInfo.ownerUri, - actionInfo.targetObject); + actionInfo.ownerUri, + actionInfo.targetObject); return TPromise.as(true); } } @@ -229,7 +229,7 @@ export class NewStepAction extends Action { let server = context.serverName; let jobInfo = context.agentJobInfo; return new TPromise((resolve, reject) => { - resolve(this._commandService.executeCommand('agent.openNewStepDialog', ownerUri, server, jobInfo , null)); + resolve(this._commandService.executeCommand('agent.openNewStepDialog', ownerUri, server, jobInfo, null)); }); } } @@ -317,8 +317,8 @@ export class EditAlertAction extends Action { public run(actionInfo: IJobActionInfo): TPromise { this._commandService.executeCommand( 'agent.openAlertDialog', - actionInfo.ownerUri, - actionInfo.targetObject); + actionInfo.ownerUri, + actionInfo.targetObject); return TPromise.as(true); } } @@ -403,8 +403,8 @@ export class EditOperatorAction extends Action { public run(actionInfo: IJobActionInfo): TPromise { this._commandService.executeCommand( 'agent.openOperatorDialog', - actionInfo.ownerUri, - actionInfo.targetObject); + actionInfo.ownerUri, + actionInfo.targetObject); return TPromise.as(true); } } @@ -489,8 +489,8 @@ export class EditProxyAction extends Action { public run(actionInfo: IJobActionInfo): TPromise { this._commandService.executeCommand( 'agent.openProxyDialog', - actionInfo.ownerUri, - actionInfo.targetObject); + actionInfo.ownerUri, + actionInfo.targetObject); return TPromise.as(true); } } diff --git a/src/sql/parts/jobManagement/common/jobManagementService.ts b/src/sql/platform/jobManagement/common/jobManagementService.ts similarity index 72% rename from src/sql/parts/jobManagement/common/jobManagementService.ts rename to src/sql/platform/jobManagement/common/jobManagementService.ts index b793eaefac..05b074b797 100644 --- a/src/sql/parts/jobManagement/common/jobManagementService.ts +++ b/src/sql/platform/jobManagement/common/jobManagementService.ts @@ -8,8 +8,8 @@ import { localize } from 'vs/nls'; import * as sqlops from 'sqlops'; import { TPromise } from 'vs/base/common/winjs.base'; -import { IJobManagementService } from 'sql/parts/jobManagement/common/interfaces'; -import { IConnectionManagementService } from 'sql/parts/connection/common/connectionManagement'; +import { IJobManagementService } from 'sql/platform/jobManagement/common/interfaces'; +import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement'; import { Event, Emitter } from 'vs/base/common/event'; export class JobManagementService implements IJobManagementService { @@ -19,10 +19,10 @@ export class JobManagementService implements IJobManagementService { public readonly onDidChange: Event = this._onDidChange.event; private _providers: { [handle: string]: sqlops.AgentServicesProvider; } = Object.create(null); - private _jobCacheObjectMap : {[server: string]: JobCacheObject; } = {}; - private _operatorsCacheObjectMap: {[server: string]: OperatorsCacheObject; } = {}; - private _alertsCacheObject: {[server: string]: AlertsCacheObject; } = {}; - private _proxiesCacheObjectMap: {[server: string]: ProxiesCacheObject; } = {}; + private _jobCacheObjectMap: { [server: string]: JobCacheObject; } = {}; + private _operatorsCacheObjectMap: { [server: string]: OperatorsCacheObject; } = {}; + private _alertsCacheObject: { [server: string]: AlertsCacheObject; } = {}; + private _proxiesCacheObjectMap: { [server: string]: ProxiesCacheObject; } = {}; constructor( @IConnectionManagementService private _connectionService: IConnectionManagementService @@ -99,7 +99,7 @@ export class JobManagementService implements IJobManagementService { }); } - public deleteProxy(connectionUri: string, proxy: sqlops.AgentProxyInfo): Thenable { + public deleteProxy(connectionUri: string, proxy: sqlops.AgentProxyInfo): Thenable { return this._runAction(connectionUri, (runner) => { return runner.deleteProxy(connectionUri, proxy); }); @@ -129,19 +129,19 @@ export class JobManagementService implements IJobManagementService { this._providers[providerId] = provider; } - public get jobCacheObjectMap(): {[server: string]: JobCacheObject;} { + public get jobCacheObjectMap(): { [server: string]: JobCacheObject; } { return this._jobCacheObjectMap; } - public get alertsCacheObjectMap(): {[server: string]: AlertsCacheObject; } { + public get alertsCacheObjectMap(): { [server: string]: AlertsCacheObject; } { return this._alertsCacheObject; } - public get proxiesCacheObjectMap(): {[server: string]: ProxiesCacheObject; } { + public get proxiesCacheObjectMap(): { [server: string]: ProxiesCacheObject; } { return this._proxiesCacheObjectMap; } - public get operatorsCacheObjectMap(): {[server: string]: OperatorsCacheObject} { + public get operatorsCacheObjectMap(): { [server: string]: OperatorsCacheObject } { return this._operatorsCacheObjectMap; } @@ -173,87 +173,87 @@ export class JobCacheObject { private _serverName: string; private _dataView: Slick.Data.DataView; - /* Getters */ - public get jobs(): sqlops.AgentJobInfo[] { - return this._jobs; - } + /* Getters */ + public get jobs(): sqlops.AgentJobInfo[] { + return this._jobs; + } - public get jobHistories(): { [jobID: string]: sqlops.AgentJobHistoryInfo[] } { - return this._jobHistories; - } + public get jobHistories(): { [jobID: string]: sqlops.AgentJobHistoryInfo[] } { + return this._jobHistories; + } - public get prevJobID(): string { - return this._prevJobID; - } + public get prevJobID(): string { + return this._prevJobID; + } - public getJobHistory(jobID: string): sqlops.AgentJobHistoryInfo[] { - return this._jobHistories[jobID]; - } + public getJobHistory(jobID: string): sqlops.AgentJobHistoryInfo[] { + return this._jobHistories[jobID]; + } - public get serverName(): string { - return this._serverName; - } + public get serverName(): string { + return this._serverName; + } - public get dataView(): Slick.Data.DataView { - return this._dataView; - } + public get dataView(): Slick.Data.DataView { + return this._dataView; + } - public getRunChart(jobID: string): string[] { - return this._runCharts[jobID]; - } + public getRunChart(jobID: string): string[] { + return this._runCharts[jobID]; + } - public getJobSteps(jobID: string): sqlops.AgentJobStepInfo[] { - return this._jobSteps[jobID]; - } + public getJobSteps(jobID: string): sqlops.AgentJobStepInfo[] { + return this._jobSteps[jobID]; + } - public getJobAlerts(jobID: string): sqlops.AgentAlertInfo[] { - return this._jobAlerts[jobID]; - } + public getJobAlerts(jobID: string): sqlops.AgentAlertInfo[] { + return this._jobAlerts[jobID]; + } - public getJobSchedules(jobID: string): sqlops.AgentJobScheduleInfo[] { - return this._jobSchedules[jobID]; - } + public getJobSchedules(jobID: string): sqlops.AgentJobScheduleInfo[] { + return this._jobSchedules[jobID]; + } - /* Setters */ - public set jobs(value: sqlops.AgentJobInfo[]) { - this._jobs = value; - } + /* Setters */ + public set jobs(value: sqlops.AgentJobInfo[]) { + this._jobs = value; + } - public set jobHistories(value: { [jobID: string]: sqlops.AgentJobHistoryInfo[]; }) { - this._jobHistories = value; - } + public set jobHistories(value: { [jobID: string]: sqlops.AgentJobHistoryInfo[]; }) { + this._jobHistories = value; + } - public set prevJobID(value: string) { - this._prevJobID = value; - } + public set prevJobID(value: string) { + this._prevJobID = value; + } - public setJobHistory(jobID:string, value: sqlops.AgentJobHistoryInfo[]) { - this._jobHistories[jobID] = value; - } + public setJobHistory(jobID: string, value: sqlops.AgentJobHistoryInfo[]) { + this._jobHistories[jobID] = value; + } - public setRunChart(jobID: string, value: string[]) { - this._runCharts[jobID] = value; - } + public setRunChart(jobID: string, value: string[]) { + this._runCharts[jobID] = value; + } - public set serverName(value: string) { - this._serverName = value; - } + public set serverName(value: string) { + this._serverName = value; + } - public set dataView(value: Slick.Data.DataView) { - this._dataView = value; - } + public set dataView(value: Slick.Data.DataView) { + this._dataView = value; + } - public setJobSteps(jobID: string, value: sqlops.AgentJobStepInfo[]) { - this._jobSteps[jobID] = value; - } + public setJobSteps(jobID: string, value: sqlops.AgentJobStepInfo[]) { + this._jobSteps[jobID] = value; + } - public setJobAlerts(jobID: string, value: sqlops.AgentAlertInfo[]) { - this._jobAlerts[jobID] = value; - } + public setJobAlerts(jobID: string, value: sqlops.AgentAlertInfo[]) { + this._jobAlerts[jobID] = value; + } - public setJobSchedules(jobID: string, value: sqlops.AgentJobScheduleInfo[]) { - this._jobSchedules[jobID] = value; - } + public setJobSchedules(jobID: string, value: sqlops.AgentJobScheduleInfo[]) { + this._jobSchedules[jobID] = value; + } } /** @@ -297,12 +297,12 @@ export class OperatorsCacheObject { * Server level caching of job alerts and the alerts view */ export class AlertsCacheObject { - _serviceBrand: any; - private _alerts: sqlops.AgentAlertInfo[]; - private _dataView: Slick.Data.DataView; - private _serverName: string; + _serviceBrand: any; + private _alerts: sqlops.AgentAlertInfo[]; + private _dataView: Slick.Data.DataView; + private _serverName: string; - /** Getters */ + /** Getters */ public get alerts(): sqlops.AgentAlertInfo[] { return this._alerts; } diff --git a/src/sql/parts/jobManagement/common/jobManagementUtilities.ts b/src/sql/platform/jobManagement/common/jobManagementUtilities.ts similarity index 65% rename from src/sql/parts/jobManagement/common/jobManagementUtilities.ts rename to src/sql/platform/jobManagement/common/jobManagementUtilities.ts index 1aa2880556..61450af10a 100644 --- a/src/sql/parts/jobManagement/common/jobManagementUtilities.ts +++ b/src/sql/platform/jobManagement/common/jobManagementUtilities.ts @@ -14,26 +14,26 @@ export class JobManagementUtilities { public static jobMessageLength: number = 110; public static convertToStatusString(status: number): string { - switch(status) { - case(0): return nls.localize('agentUtilities.failed','Failed'); - case(1): return nls.localize('agentUtilities.succeeded', 'Succeeded'); - case(2): return nls.localize('agentUtilities.retry', 'Retry'); - case(3): return nls.localize('agentUtilities.canceled', 'Cancelled'); - case(4): return nls.localize('agentUtilities.inProgress', 'In Progress'); - case(5): return nls.localize('agentUtilities.statusUnknown', 'Status Unknown'); + switch (status) { + case (0): return nls.localize('agentUtilities.failed', 'Failed'); + case (1): return nls.localize('agentUtilities.succeeded', 'Succeeded'); + case (2): return nls.localize('agentUtilities.retry', 'Retry'); + case (3): return nls.localize('agentUtilities.canceled', 'Cancelled'); + case (4): return nls.localize('agentUtilities.inProgress', 'In Progress'); + case (5): return nls.localize('agentUtilities.statusUnknown', 'Status Unknown'); default: return nls.localize('agentUtilities.statusUnknown', 'Status Unknown'); } } public static convertToExecutionStatusString(status: number): string { - switch(status) { - case(1): return nls.localize('agentUtilities.executing', 'Executing'); - case(2): return nls.localize('agentUtilities.waitingForThread', 'Waiting for Thread'); - case(3): return nls.localize('agentUtilities.betweenRetries', 'Between Retries'); - case(4): return nls.localize('agentUtilities.idle', 'Idle'); - case(5): return nls.localize('agentUtilities.suspended', 'Suspended'); - case(6): return nls.localize('agentUtilities.obsolete', '[Obsolete]'); - case(7): return 'PerformingCompletionActions'; + switch (status) { + case (1): return nls.localize('agentUtilities.executing', 'Executing'); + case (2): return nls.localize('agentUtilities.waitingForThread', 'Waiting for Thread'); + case (3): return nls.localize('agentUtilities.betweenRetries', 'Between Retries'); + case (4): return nls.localize('agentUtilities.idle', 'Idle'); + case (5): return nls.localize('agentUtilities.suspended', 'Suspended'); + case (6): return nls.localize('agentUtilities.obsolete', '[Obsolete]'); + case (7): return 'PerformingCompletionActions'; default: return nls.localize('agentUtilities.statusUnknown', 'Status Unknown'); } } @@ -68,26 +68,26 @@ export class JobManagementUtilities { this.setRunnable(startIcon, JobManagementUtilities.startIconClass.length); this.setRunnable(stopIcon, JobManagementUtilities.stopIconClass.length); switch (executionStatus) { - case(1): // executing + case (1): // executing startIcon.className += ' non-runnable'; return; - case(2): // Waiting for thread + case (2): // Waiting for thread startIcon.className += ' non-runnable'; return; - case(3): // Between retries + case (3): // Between retries startIcon.className += ' non-runnable'; return; - case(4): //Idle + case (4): //Idle stopIcon.className += ' non-runnable'; return; - case(5): // Suspended + case (5): // Suspended stopIcon.className += ' non-runnable'; return; - case(6): //obsolete + case (6): //obsolete startIcon.className += ' non-runnable'; stopIcon.className += ' non-runnable'; return; - case(7): //Performing Completion Actions + case (7): //Performing Completion Actions startIcon.className += ' non-runnable'; return; default: @@ -102,48 +102,48 @@ export class JobManagementUtilities { } public static convertColFieldToName(colField: string) { - switch(colField) { - case('name'): + switch (colField) { + case ('name'): return 'Name'; - case('lastRun'): + case ('lastRun'): return 'Last Run'; - case('nextRun'): + case ('nextRun'): return 'Next Run'; - case('enabled'): + case ('enabled'): return 'Enabled'; - case('status'): + case ('status'): return 'Status'; - case('category'): + case ('category'): return 'Category'; - case('runnable'): + case ('runnable'): return 'Runnable'; - case('schedule'): + case ('schedule'): return 'Schedule'; - case('lastRunOutcome'): + case ('lastRunOutcome'): return 'Last Run Outcome'; } return ''; } public static convertColNameToField(columnName: string) { - switch(columnName) { - case('Name'): + switch (columnName) { + case ('Name'): return 'name'; - case('Last Run'): + case ('Last Run'): return 'lastRun'; - case('Next Run'): + case ('Next Run'): return 'nextRun'; - case('Enabled'): + case ('Enabled'): return 'enabled'; - case('Status'): + case ('Status'): return 'status'; - case('Category'): + case ('Category'): return 'category'; - case('Runnable'): + case ('Runnable'): return 'runnable'; - case('Schedule'): + case ('Schedule'): return 'schedule'; - case('Last Run Outcome'): + case ('Last Run Outcome'): return 'lastRunOutcome'; } return ''; diff --git a/src/sql/services/metadata/metadataService.ts b/src/sql/platform/metadata/common/metadataService.ts similarity index 97% rename from src/sql/services/metadata/metadataService.ts rename to src/sql/platform/metadata/common/metadataService.ts index 7c2a9b03f9..2fd64e148d 100644 --- a/src/sql/services/metadata/metadataService.ts +++ b/src/sql/platform/metadata/common/metadataService.ts @@ -7,7 +7,7 @@ import { IDisposable, dispose } from 'vs/base/common/lifecycle'; import { createDecorator } from 'vs/platform/instantiation/common/instantiation'; -import { IConnectionManagementService } from 'sql/parts/connection/common/connectionManagement'; +import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement'; import * as sqlops from 'sqlops'; export const SERVICE_ID = 'metadataService'; diff --git a/src/sql/services/model/modelViewService.ts b/src/sql/platform/model/common/modelViewService.ts similarity index 100% rename from src/sql/services/model/modelViewService.ts rename to src/sql/platform/model/common/modelViewService.ts diff --git a/src/sql/services/modelComponents/modelViewService.ts b/src/sql/platform/modelComponents/common/modelViewService.ts similarity index 78% rename from src/sql/services/modelComponents/modelViewService.ts rename to src/sql/platform/modelComponents/common/modelViewService.ts index 8fc4e5a162..9f1319db2e 100644 --- a/src/sql/services/modelComponents/modelViewService.ts +++ b/src/sql/platform/modelComponents/common/modelViewService.ts @@ -8,9 +8,7 @@ import { createDecorator } from 'vs/platform/instantiation/common/instantiation'; import { Event } from 'vs/base/common/event'; -import * as sqlops from 'sqlops'; -import { IItemConfig, IComponentShape } from 'sql/workbench/api/common/sqlExtHostTypes'; -import { IView, IModelView } from 'sql/services/model/modelViewService'; +import { IModelView } from 'sql/platform/model/common/modelViewService'; export const SERVICE_ID = 'modelViewService'; diff --git a/src/sql/services/modelComponents/modelViewServiceImpl.ts b/src/sql/platform/modelComponents/common/modelViewServiceImpl.ts similarity index 82% rename from src/sql/services/modelComponents/modelViewServiceImpl.ts rename to src/sql/platform/modelComponents/common/modelViewServiceImpl.ts index 62648056f4..aab6218448 100644 --- a/src/sql/services/modelComponents/modelViewServiceImpl.ts +++ b/src/sql/platform/modelComponents/common/modelViewServiceImpl.ts @@ -5,9 +5,9 @@ 'use strict'; -import { IModelViewService } from 'sql/services/modelComponents/modelViewService'; +import { IModelViewService } from 'sql/platform/modelComponents/common/modelViewService'; import { Event, Emitter } from 'vs/base/common/event'; -import { IModelView } from 'sql/services/model/modelViewService'; +import { IModelView } from 'sql/platform/model/common/modelViewService'; export class ModelViewService implements IModelViewService { _serviceBrand: any; diff --git a/src/sql/common/pathUtilities.ts b/src/sql/platform/node/pathUtilities.ts similarity index 97% rename from src/sql/common/pathUtilities.ts rename to src/sql/platform/node/pathUtilities.ts index 0cf4202960..a7f1f744d1 100644 --- a/src/sql/common/pathUtilities.ts +++ b/src/sql/platform/node/pathUtilities.ts @@ -3,7 +3,7 @@ * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import * as path from 'path'; +import * as path from 'vs/base/common/paths'; import * as os from 'os'; import URI from 'vs/base/common/uri'; diff --git a/src/sql/parts/query/common/resultSerializer.ts b/src/sql/platform/node/resultSerializer.ts similarity index 93% rename from src/sql/parts/query/common/resultSerializer.ts rename to src/sql/platform/node/resultSerializer.ts index dd0417d2d6..80f5ea3c30 100644 --- a/src/sql/parts/query/common/resultSerializer.ts +++ b/src/sql/platform/node/resultSerializer.ts @@ -3,14 +3,13 @@ * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import * as ConnectionConstants from 'sql/parts/connection/common/constants'; +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 { IQueryManagementService } from 'sql/parts/query/common/queryManagement'; +import { IQueryManagementService } from 'sql/platform/query/common/queryManagement'; import { ISaveRequest, SaveFormat } from 'sql/parts/grid/common/interfaces'; -import * as PathUtilities from 'sql/common/pathUtilities'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; import { IOutputService, IOutputChannel, IOutputChannelRegistry, Extensions as OutputExtensions } from 'vs/workbench/parts/output/common/output'; @@ -25,12 +24,12 @@ import * as paths from 'vs/base/common/paths'; import * as nls from 'vs/nls'; import * as pretty from 'pretty-data'; -import * as path from 'path'; import Severity from 'vs/base/common/severity'; import { INotificationService } from 'vs/platform/notification/common/notification'; import { getBaseLabel } from 'vs/base/common/labels'; import { ShowFileInFolderAction, OpenFileInFolderAction } from 'sql/workbench/common/workspaceActions'; import { IEditorService } from 'vs/workbench/services/editor/common/editorService'; +import { getRootPath, resolveCurrentDirectory, resolveFilePath } from 'sql/platform/node/pathUtilities'; let prevSavePath: string; @@ -137,7 +136,7 @@ export class ResultSerializer { } private get rootPath(): string { - return PathUtilities.getRootPath(this._contextService); + return getRootPath(this._contextService); } private logToOutputChannel(message: string): void { @@ -145,8 +144,8 @@ export class ResultSerializer { } private promptForFilepath(saveRequest: ISaveRequest): Thenable { - let filepathPlaceHolder = (prevSavePath) ? path.dirname(prevSavePath) : PathUtilities.resolveCurrentDirectory(this._uri, this.rootPath); - filepathPlaceHolder = path.join(filepathPlaceHolder, this.getResultsDefaultFilename(saveRequest)); + let filepathPlaceHolder = (prevSavePath) ? paths.dirname(prevSavePath) : resolveCurrentDirectory(this._uri, this.rootPath); + filepathPlaceHolder = paths.join(filepathPlaceHolder, this.getResultsDefaultFilename(saveRequest)); return this._windowService.showSaveDialog({ title: nls.localize('resultsSerializer.saveAsFileTitle', 'Choose Results File'), defaultPath: paths.normalize(filepathPlaceHolder, true), @@ -180,7 +179,7 @@ export class ResultSerializer { private getResultsFileExtension(saveRequest: ISaveRequest): FileFilter[] { let fileFilters = new Array(); - let fileFilter: { extensions: string[]; name: string } = { extensions: undefined, name: undefined}; + let fileFilter: { extensions: string[]; name: string } = { extensions: undefined, name: undefined }; switch (saveRequest.format) { case SaveFormat.CSV: @@ -274,8 +273,8 @@ export class ResultSerializer { private getParameters(filePath: string, batchIndex: number, resultSetNo: number, format: string, selection: Slick.Range): SaveResultsRequestParams { let saveResultsParams: SaveResultsRequestParams; - if (!path.isAbsolute(filePath)) { - this._filePath = PathUtilities.resolveFilePath(this._uri, filePath, this.rootPath); + if (!paths.isAbsolute(filePath)) { + this._filePath = resolveFilePath(this._uri, filePath, this.rootPath); } else { this._filePath = filePath; } @@ -393,14 +392,14 @@ export class ResultSerializer { this._editorService.openEditor(input, { pinned: true }) .then( - (success) => { - }, - (error: any) => { - this._notificationService.notify({ - severity: Severity.Error, - message: error - }); - } + (success) => { + }, + (error: any) => { + this._notificationService.notify({ + severity: Severity.Error, + message: error + }); + } ); } } diff --git a/src/sql/common/sqlOAuthService.ts b/src/sql/platform/oAuth/common/sqlOAuthService.ts similarity index 100% rename from src/sql/common/sqlOAuthService.ts rename to src/sql/platform/oAuth/common/sqlOAuthService.ts diff --git a/src/sql/common/browser/sqlOAuthServiceImpl.ts b/src/sql/platform/oAuth/electron-browser/sqlOAuthServiceImpl.ts similarity index 95% rename from src/sql/common/browser/sqlOAuthServiceImpl.ts rename to src/sql/platform/oAuth/electron-browser/sqlOAuthServiceImpl.ts index 827987e919..c30e217de1 100644 --- a/src/sql/common/browser/sqlOAuthServiceImpl.ts +++ b/src/sql/platform/oAuth/electron-browser/sqlOAuthServiceImpl.ts @@ -6,7 +6,7 @@ 'use strict'; import * as electron from 'electron'; -import { ISqlOAuthService } from 'sql/common/sqlOAuthService'; +import { ISqlOAuthService } from 'sql/platform/oAuth/common/sqlOAuthService'; /** * Implements simple electron based utilities for registering and sending IPC to the main thread to diff --git a/src/sql/parts/query/common/queryManagement.ts b/src/sql/platform/query/common/queryManagement.ts similarity index 98% rename from src/sql/parts/query/common/queryManagement.ts rename to src/sql/platform/query/common/queryManagement.ts index a50eb75318..4434b5b646 100644 --- a/src/sql/parts/query/common/queryManagement.ts +++ b/src/sql/platform/query/common/queryManagement.ts @@ -3,8 +3,8 @@ * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import QueryRunner from 'sql/parts/query/execution/queryRunner'; -import { IConnectionManagementService } from 'sql/parts/connection/common/connectionManagement'; +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'; diff --git a/src/sql/parts/query/execution/queryModel.ts b/src/sql/platform/query/common/queryModel.ts similarity index 96% rename from src/sql/parts/query/execution/queryModel.ts rename to src/sql/platform/query/common/queryModel.ts index a48b995bf5..0a5a5baf65 100644 --- a/src/sql/parts/query/execution/queryModel.ts +++ b/src/sql/platform/query/common/queryModel.ts @@ -3,7 +3,7 @@ * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import QueryRunner from 'sql/parts/query/execution/queryRunner'; +import QueryRunner from 'sql/platform/query/common/queryRunner'; import { DataService } from 'sql/parts/grid/services/dataService'; import { createDecorator } from 'vs/platform/instantiation/common/instantiation'; import { Event } from 'vs/base/common/event'; @@ -18,7 +18,7 @@ import { EditRevertCellResult, ExecutionPlanOptions } from 'sqlops'; -import { QueryInfo } from 'sql/parts/query/execution/queryModelService'; +import { QueryInfo } from 'sql/platform/query/common/queryModelService'; export const SERVICE_ID = 'queryModelService'; diff --git a/src/sql/parts/query/execution/queryModelService.ts b/src/sql/platform/query/common/queryModelService.ts similarity index 99% rename from src/sql/parts/query/execution/queryModelService.ts rename to src/sql/platform/query/common/queryModelService.ts index 7a67e6fd86..221a92f090 100644 --- a/src/sql/parts/query/execution/queryModelService.ts +++ b/src/sql/platform/query/common/queryModelService.ts @@ -7,9 +7,9 @@ import * as GridContentEvents from 'sql/parts/grid/common/gridContentEvents'; import * as LocalizedConstants from 'sql/parts/query/common/localizedConstants'; -import QueryRunner, { EventType as QREvents } from 'sql/parts/query/execution/queryRunner'; +import QueryRunner, { EventType as QREvents } from 'sql/platform/query/common/queryRunner'; import { DataService } from 'sql/parts/grid/services/dataService'; -import { IQueryModelService } from 'sql/parts/query/execution/queryModel'; +import { IQueryModelService } from 'sql/platform/query/common/queryModel'; import { QueryInput } from 'sql/parts/query/common/queryInput'; import { QueryStatusbarItem } from 'sql/parts/query/execution/queryStatus'; import { SqlFlavorStatusbarItem } from 'sql/parts/query/common/flavorStatus'; diff --git a/src/sql/parts/query/execution/queryRunner.ts b/src/sql/platform/query/common/queryRunner.ts similarity index 96% rename from src/sql/parts/query/execution/queryRunner.ts rename to src/sql/platform/query/common/queryRunner.ts index 09905fbb48..e6c1231d41 100644 --- a/src/sql/parts/query/execution/queryRunner.ts +++ b/src/sql/platform/query/common/queryRunner.ts @@ -9,14 +9,12 @@ import * as sqlops from 'sqlops'; import * as Constants from 'sql/parts/query/common/constants'; import * as WorkbenchUtils from 'sql/workbench/common/sqlWorkbenchUtils'; -import { IQueryManagementService } from 'sql/parts/query/common/queryManagement'; -import * as Utils from 'sql/parts/connection/common/utils'; +import { IQueryManagementService } from 'sql/platform/query/common/queryManagement'; +import * as Utils from 'sql/platform/connection/common/utils'; import { SaveFormat } from 'sql/parts/grid/common/interfaces'; -import { echo, debounceEvent } from 'sql/base/common/event'; import { Deferred } from 'sql/base/common/promise'; import Severity from 'vs/base/common/severity'; -import { IWorkspaceConfigurationService } from 'vs/workbench/services/configuration/common/configuration'; import * as nls from 'vs/nls'; import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService'; import * as types from 'vs/base/common/types'; @@ -25,8 +23,9 @@ import { IDisposable, Disposable } from 'vs/base/common/lifecycle'; import { INotificationService } from 'vs/platform/notification/common/notification'; import { Emitter, Event } from 'vs/base/common/event'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; -import { ResultSerializer } from 'sql/parts/query/common/resultSerializer'; +import { ResultSerializer } from 'sql/platform/node/resultSerializer'; import { TPromise } from 'vs/base/common/winjs.base'; +import { IConfigurationService } from 'vs/platform/configuration/common/configuration'; export interface IEditSessionReadyEvent { ownerUri: string; @@ -112,7 +111,7 @@ export default class QueryRunner extends Disposable { public uri: string, @IQueryManagementService private _queryManagementService: IQueryManagementService, @INotificationService private _notificationService: INotificationService, - @IWorkspaceConfigurationService private _workspaceConfigurationService: IWorkspaceConfigurationService, + @IConfigurationService private _configurationService: IConfigurationService, @IClipboardService private _clipboardService: IClipboardService, @IInstantiationService private instantiationService: IInstantiationService ) { @@ -598,7 +597,7 @@ export default class QueryRunner extends Disposable { } private getEolString(): string { - const { eol } = this._workspaceConfigurationService.getValue<{ eol: string }>('files'); + const { eol } = this._configurationService.getValue<{ eol: string }>('files'); return eol; } @@ -608,13 +607,13 @@ export default class QueryRunner extends Disposable { return includeHeaders; } // else get config option from vscode config - includeHeaders = WorkbenchUtils.getSqlConfigValue(this._workspaceConfigurationService, Constants.copyIncludeHeaders); + includeHeaders = WorkbenchUtils.getSqlConfigValue(this._configurationService, Constants.copyIncludeHeaders); return !!includeHeaders; } private shouldRemoveNewLines(): boolean { // get config copyRemoveNewLine option from vscode config - let removeNewLines: boolean = WorkbenchUtils.getSqlConfigValue(this._workspaceConfigurationService, Constants.configCopyRemoveNewLine); + let removeNewLines: boolean = WorkbenchUtils.getSqlConfigValue(this._configurationService, Constants.configCopyRemoveNewLine); return !!removeNewLines; } @@ -645,7 +644,7 @@ export default class QueryRunner extends Disposable { private sendBatchTimeMessage(batchId: number, executionTime: string): void { // get config copyRemoveNewLine option from vscode config - let showBatchTime: boolean = WorkbenchUtils.getSqlConfigValue(this._workspaceConfigurationService, Constants.configShowBatchTime); + let showBatchTime: boolean = WorkbenchUtils.getSqlConfigValue(this._configurationService, Constants.configShowBatchTime); if (showBatchTime) { let message: sqlops.IResultMessage = { batchId: batchId, diff --git a/src/sql/parts/disasterRecovery/restore/mssqlRestoreInfo.ts b/src/sql/platform/restore/common/mssqlRestoreInfo.ts similarity index 100% rename from src/sql/parts/disasterRecovery/restore/mssqlRestoreInfo.ts rename to src/sql/platform/restore/common/mssqlRestoreInfo.ts diff --git a/src/sql/parts/disasterRecovery/restore/common/restoreService.ts b/src/sql/platform/restore/common/restoreService.ts similarity index 90% rename from src/sql/parts/disasterRecovery/restore/common/restoreService.ts rename to src/sql/platform/restore/common/restoreService.ts index e78a05e67c..edf6429cb4 100644 --- a/src/sql/parts/disasterRecovery/restore/common/restoreService.ts +++ b/src/sql/platform/restore/common/restoreService.ts @@ -9,11 +9,11 @@ import { TPromise } from 'vs/base/common/winjs.base'; import { createDecorator } from 'vs/platform/instantiation/common/instantiation'; import * as sqlops from 'sqlops'; -import { IConnectionProfile } from 'sql/parts/connection/common/interfaces'; +import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; +export { TaskExecutionMode } from 'sql/platform/backup/common/backupService'; export const SERVICE_ID = 'restoreService'; export const IRestoreService = createDecorator(SERVICE_ID); -export { TaskExecutionMode } from 'sql/parts/disasterRecovery/backup/common/backupService'; export interface IRestoreService { _serviceBrand: any; diff --git a/src/sql/parts/disasterRecovery/restore/common/restoreServiceImpl.ts b/src/sql/platform/restore/common/restoreServiceImpl.ts similarity index 94% rename from src/sql/parts/disasterRecovery/restore/common/restoreServiceImpl.ts rename to src/sql/platform/restore/common/restoreServiceImpl.ts index 3154e42316..edd61dfd9b 100644 --- a/src/sql/parts/disasterRecovery/restore/common/restoreServiceImpl.ts +++ b/src/sql/platform/restore/common/restoreServiceImpl.ts @@ -4,27 +4,29 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; -import { IConnectionManagementService } from 'sql/parts/connection/common/connectionManagement'; -import * as sqlops from 'sqlops'; import { TPromise } from 'vs/base/common/winjs.base'; -import * as Constants from 'sql/common/constants'; -import * as TelemetryKeys from 'sql/common/telemetryKeys'; -import * as TelemetryUtils from 'sql/common/telemetryUtilities'; 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 { ICapabilitiesService } from 'sql/services/capabilities/capabilitiesService'; -import { IRestoreService, IRestoreDialogController, TaskExecutionMode } from 'sql/parts/disasterRecovery/restore/common/restoreService'; + +import * as sqlops from 'sqlops'; + +import { ICapabilitiesService } from 'sql/platform/capabilities/common/capabilitiesService'; +import { IRestoreService, IRestoreDialogController, TaskExecutionMode } from 'sql/platform/restore/common/restoreService'; import { OptionsDialog } from 'sql/base/browser/ui/modal/optionsDialog'; import { RestoreDialog } from 'sql/parts/disasterRecovery/restore/restoreDialog'; -import * as ConnectionConstants from 'sql/parts/connection/common/constants'; -import { MssqlRestoreInfo } from 'sql/parts/disasterRecovery/restore/mssqlRestoreInfo'; -import { IConnectionProfile } from 'sql/parts/connection/common/interfaces'; -import { ProviderConnectionInfo } from 'sql/parts/connection/common/providerConnectionInfo'; -import * as Utils from 'sql/parts/connection/common/utils'; +import * as ConnectionConstants from 'sql/platform/connection/common/constants'; +import { MssqlRestoreInfo } from 'sql/platform/restore/common/mssqlRestoreInfo'; +import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; +import { ProviderConnectionInfo } from 'sql/platform/connection/common/providerConnectionInfo'; +import * as Utils from 'sql/platform/connection/common/utils'; import { IObjectExplorerService } from 'sql/parts/objectExplorer/common/objectExplorerService'; -import { ITaskService } from 'sql/parts/taskHistory/common/taskService'; +import { ITaskService } from 'sql/platform/taskHistory/common/taskService'; import { TaskStatus, TaskNode } from 'sql/parts/taskHistory/common/taskNode'; +import * as Constants from 'sql/common/constants'; +import * as TelemetryKeys from 'sql/common/telemetryKeys'; +import * as TelemetryUtils from 'sql/common/telemetryUtilities'; +import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement'; export class RestoreService implements IRestoreService { @@ -129,7 +131,6 @@ export class RestoreService implements IRestoreService { } } - export class RestoreDialogController implements IRestoreDialogController { _serviceBrand: any; diff --git a/src/sql/services/scripting/scriptingService.ts b/src/sql/platform/scripting/common/scriptingService.ts similarity index 97% rename from src/sql/services/scripting/scriptingService.ts rename to src/sql/platform/scripting/common/scriptingService.ts index 8e7db3a678..d7f9efdc5f 100644 --- a/src/sql/services/scripting/scriptingService.ts +++ b/src/sql/platform/scripting/common/scriptingService.ts @@ -7,7 +7,7 @@ import { IDisposable, dispose } from 'vs/base/common/lifecycle'; import { createDecorator } from 'vs/platform/instantiation/common/instantiation'; -import { IConnectionManagementService } from 'sql/parts/connection/common/connectionManagement'; +import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement'; import { ScriptOperation } from 'sql/workbench/common/taskUtilities'; import * as sqlops from 'sqlops'; import { error } from 'sql/base/common/log'; diff --git a/src/sql/services/serialization/serializationService.ts b/src/sql/platform/serialization/common/serializationService.ts similarity index 90% rename from src/sql/services/serialization/serializationService.ts rename to src/sql/platform/serialization/common/serializationService.ts index f48b3a062e..b46575c444 100644 --- a/src/sql/services/serialization/serializationService.ts +++ b/src/sql/platform/serialization/common/serializationService.ts @@ -7,9 +7,8 @@ import { IDisposable, dispose } from 'vs/base/common/lifecycle'; import { createDecorator } from 'vs/platform/instantiation/common/instantiation'; -import { IConnectionManagementService } from 'sql/parts/connection/common/connectionManagement'; -import { ICapabilitiesService } from 'sql/services/capabilities/capabilitiesService'; -import * as Constants from 'sql/common/constants'; +import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement'; +import { ICapabilitiesService } from 'sql/platform/capabilities/common/capabilitiesService'; import * as sqlops from 'sqlops'; export const SERVICE_ID = 'serializationService'; @@ -68,7 +67,7 @@ export class SerializationService implements ISerializationService { } public disabledSaveAs(): Thenable { - return Promise.resolve({ messages: Constants.SerializationDisabled }); + return Promise.resolve({ messages: 'Saving results into different format disabled for this data provider.' }); } diff --git a/src/sql/platform/serverGroup/common/serverGroupController.ts b/src/sql/platform/serverGroup/common/serverGroupController.ts new file mode 100644 index 0000000000..e60ac5b54a --- /dev/null +++ b/src/sql/platform/serverGroup/common/serverGroupController.ts @@ -0,0 +1,23 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the Source EULA. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ + +'use strict'; + +import { createDecorator } from 'vs/platform/instantiation/common/instantiation'; +import { TPromise } from 'vs/base/common/winjs.base'; + +import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement'; +import { ConnectionProfileGroup } from 'sql/platform/connection/common/connectionProfileGroup'; + +export interface IServerGroupDialogCallbacks { + onAddGroup(groupName: string): void; + onClose(): void; +} +export const IServerGroupController = createDecorator('serverGroupController'); +export interface IServerGroupController { + _serviceBrand: any; + showCreateGroupDialog(connectionManagementService: IConnectionManagementService, callbacks?: IServerGroupDialogCallbacks): TPromise; + showEditGroupDialog(connectionManagementService: IConnectionManagementService, group: ConnectionProfileGroup): TPromise; +} diff --git a/src/sql/parts/taskHistory/common/taskService.ts b/src/sql/platform/taskHistory/common/taskService.ts similarity index 98% rename from src/sql/parts/taskHistory/common/taskService.ts rename to src/sql/platform/taskHistory/common/taskService.ts index 3177c2dd74..283d51d4c2 100644 --- a/src/sql/parts/taskHistory/common/taskService.ts +++ b/src/sql/platform/taskHistory/common/taskService.ts @@ -14,7 +14,7 @@ import { localize } from 'vs/nls'; import Severity from 'vs/base/common/severity'; import { TPromise } from 'vs/base/common/winjs.base'; import { IDialogService } from 'vs/platform/dialogs/common/dialogs'; -import { IConnectionManagementService } from 'sql/parts/connection/common/connectionManagement'; +import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement'; export const SERVICE_ID = 'taskHistoryService'; export const ITaskService = createDecorator(SERVICE_ID); diff --git a/src/sql/platform/tasks/common/tasks.ts b/src/sql/platform/tasks/common/tasks.ts index 8f6dcb01db..63a9878106 100644 --- a/src/sql/platform/tasks/common/tasks.ts +++ b/src/sql/platform/tasks/common/tasks.ts @@ -2,7 +2,7 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { IConnectionProfile } from 'sql/parts/connection/common/interfaces'; +import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; import * as types from 'vs/base/common/types'; import { TPromise } from 'vs/base/common/winjs.base'; diff --git a/src/sql/platform/telemetry/fileTelemetryService.ts b/src/sql/platform/telemetry/fileTelemetryService.ts index 4072689ec3..661193cbda 100644 --- a/src/sql/platform/telemetry/fileTelemetryService.ts +++ b/src/sql/platform/telemetry/fileTelemetryService.ts @@ -19,10 +19,10 @@ export class FileTelemetryService implements ITelemetryService { } publicLog(eventName: string, data?: ITelemetryData) { - let telemetryData = JSON.stringify(Object.assign({eventName: eventName, data: data})); + let telemetryData = JSON.stringify(Object.assign({ eventName: eventName, data: data })); if (this._outputFile) { if (this._isFirst) { - fs.open(this._outputFile, fs.O_WRONLY | fs.O_CREAT, (err, fr) => { + fs.open(this._outputFile, fs.O_WRONLY | fs.O_CREAT, (err, fr) => { fs.writeFileSync(this._outputFile, telemetryData + '\n'); this._isFirst = false; }); @@ -40,4 +40,4 @@ export class FileTelemetryService implements ITelemetryService { machineId: 'someValue.machineId' }); } -} \ No newline at end of file +} diff --git a/src/sql/services/bootstrap/bootstrapParams.ts b/src/sql/services/bootstrap/bootstrapParams.ts index 4a208931b7..72f24c446c 100644 --- a/src/sql/services/bootstrap/bootstrapParams.ts +++ b/src/sql/services/bootstrap/bootstrapParams.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import { DataService } from 'sql/parts/grid/services/dataService'; -import { IConnectionProfile } from 'sql/parts/connection/common/interfaces'; +import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; import { IContextKeyService, IContextKey } from 'vs/platform/contextkey/common/contextkey'; import { ConnectionContextKey } from 'sql/parts/connection/common/connectionContextKey'; import { IBootstrapParams } from './bootstrapService'; diff --git a/src/sql/services/common/commonServiceInterface.service.ts b/src/sql/services/common/commonServiceInterface.service.ts index 8987dd5aca..83d627ba46 100644 --- a/src/sql/services/common/commonServiceInterface.service.ts +++ b/src/sql/services/common/commonServiceInterface.service.ts @@ -4,25 +4,25 @@ *--------------------------------------------------------------------------------------------*/ /* Node Modules */ -import { Injectable, Inject, forwardRef, OnDestroy } from '@angular/core'; +import { Injectable, Inject } from '@angular/core'; import { Observable } from 'rxjs/Observable'; /* SQL imports */ import { IDefaultComponentParams } from 'sql/services/bootstrap/bootstrapParams'; import { IBootstrapParams } from 'sql/services/bootstrap/bootstrapService'; -import { IMetadataService } from 'sql/services/metadata/metadataService'; -import { IConnectionManagementService } from 'sql/parts/connection/common/connectionManagement'; -import { ConnectionManagementInfo } from 'sql/parts/connection/common/connectionManagementInfo'; -import { IAdminService } from 'sql/parts/admin/common/adminService'; -import { IQueryManagementService } from 'sql/parts/query/common/queryManagement'; -import { IConnectionProfile } from 'sql/parts/connection/common/interfaces'; -import { AngularDisposable } from 'sql/base/common/lifecycle'; +import { IMetadataService } from 'sql/platform/metadata/common/metadataService'; +import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement'; +import { ConnectionManagementInfo } from 'sql/platform/connection/common/connectionManagementInfo'; +import { IAdminService } from 'sql/workbench/services/admin/common/adminService'; +import { IQueryManagementService } from 'sql/platform/query/common/queryManagement'; +import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; +import { AngularDisposable } from 'sql/base/node/lifecycle'; import { ConnectionContextKey } from 'sql/parts/connection/common/connectionContextKey'; import { ProviderMetadata, DatabaseInfo, SimpleExecuteResult } from 'sqlops'; /* VS imports */ -import { IContextKeyService, RawContextKey, IContextKey } from 'vs/platform/contextkey/common/contextkey'; +import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey'; /* Wrapper for a metadata service that contains the uri string to use on each request */ export class SingleConnectionMetadataService { diff --git a/src/sql/sqlops.proposed.d.ts b/src/sql/sqlops.proposed.d.ts index 77f6a71e32..e0367a5dd7 100644 --- a/src/sql/sqlops.proposed.d.ts +++ b/src/sql/sqlops.proposed.d.ts @@ -19,7 +19,7 @@ declare module 'sqlops' { navContainer(): ContainerBuilder; divContainer(): DivBuilder; flexContainer(): FlexBuilder; - dom(): ComponentBuilder + dom(): ComponentBuilder; card(): ComponentBuilder; inputBox(): ComponentBuilder; checkBox(): ComponentBuilder; @@ -47,8 +47,8 @@ declare module 'sqlops' { } export interface NodeCheckedEventParameters { - element: T, - checked: boolean + element: T; + checked: boolean; } export interface TreeComponentView extends vscode.Disposable { @@ -922,13 +922,13 @@ declare module 'sqlops' { /** * The title of the dialog */ - title: string, + title: string; /** * The content of the dialog. If multiple tabs are given they will be displayed with tabs * If a string is given, it should be the ID of the dialog's model view content */ - content: string | DialogTab[], + content: string | DialogTab[]; /** * The ok button @@ -1011,12 +1011,12 @@ declare module 'sqlops' { /** * The page number that the wizard changed from */ - lastPage: number, + lastPage: number; /** * The new page number or undefined if the user is closing the wizard */ - newPage: number + newPage: number; } export interface WizardPage extends ModelViewPanel { @@ -1153,7 +1153,7 @@ declare module 'sqlops' { * Set the informational message shown in the wizard. Hidden when the message is * undefined or the text is empty or undefined. The default level is error. */ - message: DialogMessage + message: DialogMessage; /** * Register an operation to run in the background when the wizard is done @@ -1337,7 +1337,7 @@ declare module 'sqlops' { /** * The actual operation to execute */ - operation: (operation: BackgroundOperation) => void + operation: (operation: BackgroundOperation) => void; } namespace tasks { diff --git a/src/sql/workbench/api/electron-browser/mainThreadDashboard.ts b/src/sql/workbench/api/electron-browser/mainThreadDashboard.ts index 7e9edc9fde..94d5267423 100644 --- a/src/sql/workbench/api/electron-browser/mainThreadDashboard.ts +++ b/src/sql/workbench/api/electron-browser/mainThreadDashboard.ts @@ -7,7 +7,7 @@ import { extHostNamedCustomer } from 'vs/workbench/api/electron-browser/extHostCustomers'; import { SqlMainContext, MainThreadDashboardShape, ExtHostDashboardShape, SqlExtHostContext } from 'sql/workbench/api/node/sqlExtHost.protocol'; import { IExtHostContext } from 'vs/workbench/api/node/extHost.protocol'; -import { IDashboardService } from 'sql/services/dashboard/common/dashboardService'; +import { IDashboardService } from 'sql/platform/dashboard/browser/dashboardService'; @extHostNamedCustomer(SqlMainContext.MainThreadDashboard) export class MainThreadDashboard implements MainThreadDashboardShape { diff --git a/src/sql/workbench/api/electron-browser/mainThreadTasks.ts b/src/sql/workbench/api/electron-browser/mainThreadTasks.ts index 5d092329e6..13374f22cb 100644 --- a/src/sql/workbench/api/electron-browser/mainThreadTasks.ts +++ b/src/sql/workbench/api/electron-browser/mainThreadTasks.ts @@ -20,7 +20,7 @@ import { import { IConnectionProfile } from 'sqlops'; -import { ConnectionProfile } from 'sql/parts/connection/common/connectionProfile'; +import { ConnectionProfile } from 'sql/platform/connection/common/connectionProfile'; @extHostNamedCustomer(SqlMainContext.MainThreadTasks) export class MainThreadTasks implements MainThreadTasksShape { diff --git a/src/sql/workbench/api/node/mainThreadAccountManagement.ts b/src/sql/workbench/api/node/mainThreadAccountManagement.ts index a3e02c0432..71ab4d7a67 100644 --- a/src/sql/workbench/api/node/mainThreadAccountManagement.ts +++ b/src/sql/workbench/api/node/mainThreadAccountManagement.ts @@ -6,7 +6,7 @@ import * as sqlops from 'sqlops'; import { TPromise } from 'vs/base/common/winjs.base'; -import { IAccountManagementService } from 'sql/services/accountManagement/interfaces'; +import { IAccountManagementService } from 'sql/platform/accountManagement/common/interfaces'; import { dispose, IDisposable } from 'vs/base/common/lifecycle'; import { ExtHostAccountManagementShape, @@ -16,7 +16,7 @@ import { } from 'sql/workbench/api/node/sqlExtHost.protocol'; import { IExtHostContext } from 'vs/workbench/api/node/extHost.protocol'; import { extHostNamedCustomer } from 'vs/workbench/api/electron-browser/extHostCustomers'; -import { UpdateAccountListEventParams } from 'sql/services/accountManagement/eventTypes'; +import { UpdateAccountListEventParams } from 'sql/platform/accountManagement/common/eventTypes'; @extHostNamedCustomer(SqlMainContext.MainThreadAccountManagement) export class MainThreadAccountManagement implements MainThreadAccountManagementShape { diff --git a/src/sql/workbench/api/node/mainThreadBackgroundTaskManagement.ts b/src/sql/workbench/api/node/mainThreadBackgroundTaskManagement.ts index 8838940ed0..95f631d9a6 100644 --- a/src/sql/workbench/api/node/mainThreadBackgroundTaskManagement.ts +++ b/src/sql/workbench/api/node/mainThreadBackgroundTaskManagement.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; -import { ITaskService } from 'sql/parts/taskHistory/common/taskService'; +import { ITaskService } from 'sql/platform/taskHistory/common/taskService'; import { MainThreadBackgroundTaskManagementShape, SqlMainContext, ExtHostBackgroundTaskManagementShape, SqlExtHostContext } from 'sql/workbench/api/node/sqlExtHost.protocol'; import { extHostNamedCustomer } from 'vs/workbench/api/electron-browser/extHostCustomers'; diff --git a/src/sql/workbench/api/node/mainThreadConnectionManagement.ts b/src/sql/workbench/api/node/mainThreadConnectionManagement.ts index 33e064ef5b..1d5d7a8387 100644 --- a/src/sql/workbench/api/node/mainThreadConnectionManagement.ts +++ b/src/sql/workbench/api/node/mainThreadConnectionManagement.ts @@ -8,16 +8,16 @@ import { SqlExtHostContext, SqlMainContext, ExtHostConnectionManagementShape, Ma import * as sqlops from 'sqlops'; import { IExtHostContext } from 'vs/workbench/api/node/extHost.protocol'; import { extHostNamedCustomer } from 'vs/workbench/api/electron-browser/extHostCustomers'; -import { IConnectionManagementService, IConnectionDialogService } from 'sql/parts/connection/common/connectionManagement'; +import { IConnectionManagementService, IConnectionDialogService } from 'sql/platform/connection/common/connectionManagement'; import { IObjectExplorerService } from 'sql/parts/objectExplorer/common/objectExplorerService'; import { IEditorService } from 'vs/workbench/services/editor/common/editorService'; import * as TaskUtilities from 'sql/workbench/common/taskUtilities'; -import { IConnectionProfile } from 'sql/parts/connection/common/interfaces'; +import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; import { dispose, IDisposable } from 'vs/base/common/lifecycle'; import { isUndefinedOrNull } from 'vs/base/common/types'; import { generateUuid } from 'vs/base/common/uuid'; -import { ICapabilitiesService } from 'sql/services/capabilities/capabilitiesService'; -import { ConnectionProfile } from 'sql/parts/connection/common/connectionProfile'; +import { ICapabilitiesService } from 'sql/platform/capabilities/common/capabilitiesService'; +import { ConnectionProfile } from 'sql/platform/connection/common/connectionProfile'; @extHostNamedCustomer(SqlMainContext.MainThreadConnectionManagement) export class MainThreadConnectionManagement implements MainThreadConnectionManagementShape { diff --git a/src/sql/workbench/api/node/mainThreadCredentialManagement.ts b/src/sql/workbench/api/node/mainThreadCredentialManagement.ts index a617de52b8..897bad59d1 100644 --- a/src/sql/workbench/api/node/mainThreadCredentialManagement.ts +++ b/src/sql/workbench/api/node/mainThreadCredentialManagement.ts @@ -10,7 +10,7 @@ import { SqlExtHostContext, ExtHostCredentialManagementShape, MainThreadCredentialManagementShape, SqlMainContext } from 'sql/workbench/api/node/sqlExtHost.protocol'; -import { ICredentialsService } from 'sql/services/credentials/credentialsService'; +import { ICredentialsService } from 'sql/platform/credentials/common/credentialsService'; import * as sqlops from 'sqlops'; import { IExtHostContext } from 'vs/workbench/api/node/extHost.protocol'; import { extHostNamedCustomer } from 'vs/workbench/api/electron-browser/extHostCustomers'; diff --git a/src/sql/workbench/api/node/mainThreadDashboardWebview.ts b/src/sql/workbench/api/node/mainThreadDashboardWebview.ts index 5d28cce4cf..fc4d0e60b9 100644 --- a/src/sql/workbench/api/node/mainThreadDashboardWebview.ts +++ b/src/sql/workbench/api/node/mainThreadDashboardWebview.ts @@ -7,7 +7,7 @@ import { MainThreadDashboardWebviewShape, SqlMainContext, ExtHostDashboardWebviewsShape, SqlExtHostContext } from 'sql/workbench/api/node/sqlExtHost.protocol'; import { extHostNamedCustomer } from 'vs/workbench/api/electron-browser/extHostCustomers'; import { IExtHostContext } from 'vs/workbench/api/node/extHost.protocol'; -import { IDashboardViewService, IDashboardWebview } from 'sql/services/dashboard/common/dashboardViewService'; +import { IDashboardViewService, IDashboardWebview } from 'sql/platform/dashboard/common/dashboardViewService'; @extHostNamedCustomer(SqlMainContext.MainThreadDashboardWebview) export class MainThreadDashboardWebview implements MainThreadDashboardWebviewShape { diff --git a/src/sql/workbench/api/node/mainThreadDataProtocol.ts b/src/sql/workbench/api/node/mainThreadDataProtocol.ts index 8076986836..21830fe49e 100644 --- a/src/sql/workbench/api/node/mainThreadDataProtocol.ts +++ b/src/sql/workbench/api/node/mainThreadDataProtocol.ts @@ -10,23 +10,23 @@ import { SqlExtHostContext, ExtHostDataProtocolShape, MainThreadDataProtocolShape, SqlMainContext } from 'sql/workbench/api/node/sqlExtHost.protocol'; -import { IConnectionManagementService } from 'sql/parts/connection/common/connectionManagement'; -import { ICapabilitiesService } from 'sql/services/capabilities/capabilitiesService'; -import { IQueryManagementService } from 'sql/parts/query/common/queryManagement'; +import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement'; +import { ICapabilitiesService } from 'sql/platform/capabilities/common/capabilitiesService'; +import { IQueryManagementService } from 'sql/platform/query/common/queryManagement'; import * as sqlops from 'sqlops'; -import { IMetadataService } from 'sql/services/metadata/metadataService'; +import { IMetadataService } from 'sql/platform/metadata/common/metadataService'; import { IObjectExplorerService } from 'sql/parts/objectExplorer/common/objectExplorerService'; -import { IScriptingService } from 'sql/services/scripting/scriptingService'; -import { IAdminService } from 'sql/parts/admin/common/adminService'; -import { IJobManagementService } from 'sql/parts/jobManagement/common/interfaces'; -import { IBackupService } from 'sql/parts/disasterRecovery/backup/common/backupService'; -import { IRestoreService } from 'sql/parts/disasterRecovery/restore/common/restoreService'; -import { ITaskService } from 'sql/parts/taskHistory/common/taskService'; -import { IProfilerService } from 'sql/parts/profiler/service/interfaces'; -import { ISerializationService } from 'sql/services/serialization/serializationService'; -import { IFileBrowserService } from 'sql/parts/fileBrowser/common/interfaces'; +import { IScriptingService } from 'sql/platform/scripting/common/scriptingService'; +import { IAdminService } from 'sql/workbench/services/admin/common/adminService'; +import { IJobManagementService } from 'sql/platform/jobManagement/common/interfaces'; +import { IBackupService } from 'sql/platform/backup/common/backupService'; +import { IRestoreService } from 'sql/platform/restore/common/restoreService'; +import { ITaskService } from 'sql/platform/taskHistory/common/taskService'; +import { IProfilerService } from 'sql/workbench/services/profiler/common/interfaces'; +import { ISerializationService } from 'sql/platform/serialization/common/serializationService'; +import { IFileBrowserService } from 'sql/platform/fileBrowser/common/interfaces'; import { IExtHostContext } from 'vs/workbench/api/node/extHost.protocol'; -import { IDacFxService } from 'sql/services/dacfx/dacFxService'; +import { IDacFxService } from 'sql/platform/dacfx/common/dacFxService'; import { extHostNamedCustomer } from 'vs/workbench/api/electron-browser/extHostCustomers'; /** diff --git a/src/sql/workbench/api/node/mainThreadModelView.ts b/src/sql/workbench/api/node/mainThreadModelView.ts index e010bbfc1d..a142cfde5a 100644 --- a/src/sql/workbench/api/node/mainThreadModelView.ts +++ b/src/sql/workbench/api/node/mainThreadModelView.ts @@ -10,9 +10,9 @@ import { IExtHostContext } from 'vs/workbench/api/node/extHost.protocol'; import { Disposable } from 'vs/base/common/lifecycle'; -import { IModelViewService } from 'sql/services/modelComponents/modelViewService'; +import { IModelViewService } from 'sql/platform/modelComponents/common/modelViewService'; import { IItemConfig, IComponentShape } from 'sql/workbench/api/common/sqlExtHostTypes'; -import { IModelView } from 'sql/services/model/modelViewService'; +import { IModelView } from 'sql/platform/model/common/modelViewService'; @extHostNamedCustomer(SqlMainContext.MainThreadModelView) diff --git a/src/sql/workbench/api/node/mainThreadModelViewDialog.ts b/src/sql/workbench/api/node/mainThreadModelViewDialog.ts index 98a3d5c3b8..0811113efa 100644 --- a/src/sql/workbench/api/node/mainThreadModelViewDialog.ts +++ b/src/sql/workbench/api/node/mainThreadModelViewDialog.ts @@ -5,8 +5,6 @@ 'use strict'; import { IEditorService } from 'vs/workbench/services/editor/common/editorService'; -import { IEditorOptions } from 'vs/platform/editor/common/editor'; -import { IEditor } from 'vs/workbench/common/editor'; import { extHostNamedCustomer } from 'vs/workbench/api/electron-browser/extHostCustomers'; import { IExtHostContext } from 'vs/workbench/api/node/extHost.protocol'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; diff --git a/src/sql/workbench/api/node/mainThreadNotebook.ts b/src/sql/workbench/api/node/mainThreadNotebook.ts index e45b92c438..094a1f1645 100644 --- a/src/sql/workbench/api/node/mainThreadNotebook.ts +++ b/src/sql/workbench/api/node/mainThreadNotebook.ts @@ -12,9 +12,9 @@ import { IExtHostContext } from 'vs/workbench/api/node/extHost.protocol'; import { Event, Emitter } from 'vs/base/common/event'; import URI from 'vs/base/common/uri'; -import { INotebookService, INotebookProvider, INotebookManager } from 'sql/services/notebook/notebookService'; +import { INotebookService, INotebookProvider, INotebookManager } from 'sql/workbench/services/notebook/common/notebookService'; import { INotebookManagerDetails, INotebookSessionDetails, INotebookKernelDetails, FutureMessageType, INotebookFutureDetails, INotebookFutureDone } from 'sql/workbench/api/common/sqlExtHostTypes'; -import { LocalContentManager } from 'sql/services/notebook/localContentManager'; +import { LocalContentManager } from 'sql/workbench/services/notebook/node/localContentManager'; import { Deferred } from 'sql/base/common/promise'; import { FutureInternal } from 'sql/parts/notebook/models/modelInterfaces'; @@ -348,11 +348,11 @@ class KernelWrapper implements sqlops.nb.IKernel { requestExecute(content: sqlops.nb.IExecuteRequest, disposeOnDone?: boolean): sqlops.nb.IFuture { let future = new FutureWrapper(this._proxy); this._proxy.ext.$requestExecute(this.kernelDetails.kernelId, content, disposeOnDone) - .then(details => { - future.setDetails(details); - // Save the future in the main thread notebook so extension can call through and reference it - this._proxy.main.addFuture(details.futureId, future); - }, error => future.setError(error)); + .then(details => { + future.setDetails(details); + // Save the future in the main thread notebook so extension can call through and reference it + this._proxy.main.addFuture(details.futureId, future); + }, error => future.setError(error)); return future; } @@ -370,7 +370,7 @@ class FutureWrapper implements FutureInternal { private _inProgress: boolean; constructor(private _proxy: Proxies) { - this._inProgress = true; + this._inProgress = true; } public setDetails(details: INotebookFutureDetails): void { diff --git a/src/sql/workbench/api/node/mainThreadNotebookDocumentsAndEditors.ts b/src/sql/workbench/api/node/mainThreadNotebookDocumentsAndEditors.ts index 6ef943bc29..1e03d02221 100644 --- a/src/sql/workbench/api/node/mainThreadNotebookDocumentsAndEditors.ts +++ b/src/sql/workbench/api/node/mainThreadNotebookDocumentsAndEditors.ts @@ -23,7 +23,7 @@ import { INotebookDocumentsAndEditorsDelta, INotebookEditorAddData, INotebookShowOptions, INotebookModelAddedData, INotebookModelChangedData } from 'sql/workbench/api/node/sqlExtHost.protocol'; import { NotebookInputModel, NotebookInput } from 'sql/parts/notebook/notebookInput'; -import { INotebookService, INotebookEditor, DEFAULT_NOTEBOOK_PROVIDER } from 'sql/services/notebook/notebookService'; +import { INotebookService, INotebookEditor, DEFAULT_NOTEBOOK_PROVIDER } from 'sql/workbench/services/notebook/common/notebookService'; import { TPromise } from 'vs/base/common/winjs.base'; import { getProvidersForFileName } from 'sql/parts/notebook/notebookUtils'; import { ISingleNotebookEditOperation } from 'sql/workbench/api/common/sqlExtHostTypes'; diff --git a/src/sql/workbench/api/node/mainThreadObjectExplorer.ts b/src/sql/workbench/api/node/mainThreadObjectExplorer.ts index 5a42ade97d..45c8ad0d91 100644 --- a/src/sql/workbench/api/node/mainThreadObjectExplorer.ts +++ b/src/sql/workbench/api/node/mainThreadObjectExplorer.ts @@ -9,11 +9,11 @@ import * as sqlops from 'sqlops'; import * as vscode from 'vscode'; import { IExtHostContext } from 'vs/workbench/api/node/extHost.protocol'; import { extHostNamedCustomer } from 'vs/workbench/api/electron-browser/extHostCustomers'; -import { IConnectionManagementService } from 'sql/parts/connection/common/connectionManagement'; +import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement'; import { IObjectExplorerService, NodeInfoWithConnection } from 'sql/parts/objectExplorer/common/objectExplorerService'; import { IEditorService } from 'vs/workbench/services/editor/common/editorService'; import * as TaskUtilities from 'sql/workbench/common/taskUtilities'; -import { IConnectionProfile } from 'sql/parts/connection/common/interfaces'; +import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; import { dispose, IDisposable } from 'vs/base/common/lifecycle'; import { TreeItemCollapsibleState } from 'sql/parts/objectExplorer/common/treeNode'; diff --git a/src/sql/workbench/api/node/mainThreadQueryEditor.ts b/src/sql/workbench/api/node/mainThreadQueryEditor.ts index ff467dcffb..d45f6822f9 100644 --- a/src/sql/workbench/api/node/mainThreadQueryEditor.ts +++ b/src/sql/workbench/api/node/mainThreadQueryEditor.ts @@ -7,7 +7,7 @@ import { SqlExtHostContext, SqlMainContext, ExtHostQueryEditorShape, MainThreadQueryEditorShape } from 'sql/workbench/api/node/sqlExtHost.protocol'; import { IExtHostContext } from 'vs/workbench/api/node/extHost.protocol'; import { extHostNamedCustomer } from 'vs/workbench/api/electron-browser/extHostCustomers'; -import { IConnectionManagementService, IConnectionCompletionOptions, ConnectionType, RunQueryOnConnectionMode } from 'sql/parts/connection/common/connectionManagement'; +import { IConnectionManagementService, IConnectionCompletionOptions, ConnectionType, RunQueryOnConnectionMode } from 'sql/platform/connection/common/connectionManagement'; import { IQueryEditorService } from 'sql/parts/query/common/queryEditorService'; import { QueryEditor } from 'sql/parts/query/editor/queryEditor'; import { IEditorService } from 'vs/workbench/services/editor/common/editorService'; diff --git a/src/sql/workbench/api/node/mainThreadResourceProvider.ts b/src/sql/workbench/api/node/mainThreadResourceProvider.ts index b2da328cab..6e955010dd 100644 --- a/src/sql/workbench/api/node/mainThreadResourceProvider.ts +++ b/src/sql/workbench/api/node/mainThreadResourceProvider.ts @@ -6,7 +6,7 @@ import * as sqlops from 'sqlops'; import { TPromise } from 'vs/base/common/winjs.base'; -import { IResourceProviderService } from 'sql/parts/accountManagement/common/interfaces'; +import { IResourceProviderService } from 'sql/workbench/services/resourceProvider/common/resourceProviderService'; import { dispose, IDisposable } from 'vs/base/common/lifecycle'; import { ExtHostResourceProviderShape, diff --git a/src/sql/workbench/api/node/mainThreadSerializationProvider.ts b/src/sql/workbench/api/node/mainThreadSerializationProvider.ts index cddced3a19..8c6f0aa9e4 100644 --- a/src/sql/workbench/api/node/mainThreadSerializationProvider.ts +++ b/src/sql/workbench/api/node/mainThreadSerializationProvider.ts @@ -10,7 +10,7 @@ import { SqlExtHostContext, ExtHostSerializationProviderShape, MainThreadSerializationProviderShape, SqlMainContext } from 'sql/workbench/api/node/sqlExtHost.protocol'; -import { ISerializationService } from 'sql/services/serialization/serializationService'; +import { ISerializationService } from 'sql/platform/serialization/common/serializationService'; import * as sqlops from 'sqlops'; import { IExtHostContext } from 'vs/workbench/api/node/extHost.protocol'; import { extHostNamedCustomer } from 'vs/workbench/api/electron-browser/extHostCustomers'; diff --git a/src/sql/workbench/common/actions.ts b/src/sql/workbench/common/actions.ts index ab15f4c8bd..6e19e78447 100644 --- a/src/sql/workbench/common/actions.ts +++ b/src/sql/workbench/common/actions.ts @@ -3,21 +3,21 @@ * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { IConnectionManagementService, IErrorMessageService } from 'sql/parts/connection/common/connectionManagement'; -import * as TaskUtilities from './taskUtilities'; +import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement'; +import * as TaskUtilities from 'sql/workbench/common/taskUtilities'; import { IQueryEditorService } from 'sql/parts/query/common/queryEditorService'; -import { IConnectionProfile } from 'sql/parts/connection/common/interfaces'; +import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; import { IInsightsConfig } from 'sql/parts/dashboard/widgets/insights/interfaces'; -import { IScriptingService } from 'sql/services/scripting/scriptingService'; -import { IRestoreDialogController } from 'sql/parts/disasterRecovery/restore/common/restoreService'; -import { IBackupUiService } from 'sql/parts/disasterRecovery/backup/common/backupService'; -import { IAngularEventingService, AngularEventType } from 'sql/services/angularEventing/angularEventingService'; +import { IScriptingService } from 'sql/platform/scripting/common/scriptingService'; +import { IRestoreDialogController } from 'sql/platform/restore/common/restoreService'; +import { IBackupUiService } from 'sql/platform/backup/common/backupService'; +import { IAngularEventingService, AngularEventType } from 'sql/platform/angularEventing/common/angularEventingService'; import { IInsightsDialogService } from 'sql/parts/insights/common/interfaces'; -import { IAdminService } from 'sql/parts/admin/common/adminService'; +import { IAdminService } from 'sql/workbench/services/admin/common/adminService'; import * as Constants from 'sql/common/constants'; -import { ScriptOperation } from 'sql/workbench/common/taskUtilities'; import { Task } from 'sql/platform/tasks/common/tasks'; import { IObjectExplorerService } from 'sql/parts/objectExplorer/common/objectExplorerService'; +import { IErrorMessageService } from 'sql/platform/errorMessage/common/errorMessageService'; import { ObjectMetadata } from 'sqlops'; @@ -132,7 +132,7 @@ export class ScriptExecuteAction extends Action { this._connectionManagementService, this._queryEditorService, this._scriptingService, - ScriptOperation.Execute, + TaskUtilities.ScriptOperation.Execute, this._errorMessageService ).then( result => { @@ -168,7 +168,7 @@ export class ScriptAlterAction extends Action { this._connectionManagementService, this._queryEditorService, this._scriptingService, - ScriptOperation.Alter, + TaskUtilities.ScriptOperation.Alter, this._errorMessageService ).then( result => { @@ -237,7 +237,7 @@ export class ScriptCreateAction extends Action { this._connectionManagementService, this._queryEditorService, this._scriptingService, - ScriptOperation.Create, + TaskUtilities.ScriptOperation.Create, this._errorMessageService ).then( result => { @@ -273,7 +273,7 @@ export class ScriptDeleteAction extends Action { this._connectionManagementService, this._queryEditorService, this._scriptingService, - ScriptOperation.Delete, + TaskUtilities.ScriptOperation.Delete, this._errorMessageService ).then( result => { diff --git a/src/sql/workbench/common/sqlWorkbenchUtils.ts b/src/sql/workbench/common/sqlWorkbenchUtils.ts index cb92313715..ca90097c73 100644 --- a/src/sql/workbench/common/sqlWorkbenchUtils.ts +++ b/src/sql/workbench/common/sqlWorkbenchUtils.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; -import ConnectionConstants = require('sql/parts/connection/common/constants'); +import ConnectionConstants = require('sql/platform/connection/common/constants'); import { QueryInput } from 'sql/parts/query/common/queryInput'; import { IConfigurationService } from 'vs/platform/configuration/common/configuration'; diff --git a/src/sql/workbench/common/taskUtilities.ts b/src/sql/workbench/common/taskUtilities.ts index e11f1d40b1..220141af65 100644 --- a/src/sql/workbench/common/taskUtilities.ts +++ b/src/sql/workbench/common/taskUtilities.ts @@ -4,31 +4,35 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; -import { IConnectionProfile } from 'sql/parts/connection/common/interfaces'; +import * as os from 'os'; + +import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; import { IConnectableInput, IConnectionManagementService, - IConnectionCompletionOptions, ConnectionType, IErrorMessageService, + IConnectionCompletionOptions, ConnectionType, RunQueryOnConnectionMode, IConnectionResult -} from 'sql/parts/connection/common/connectionManagement'; +} from 'sql/platform/connection/common/connectionManagement'; import { IQueryEditorService } from 'sql/parts/query/common/queryEditorService'; -import { IScriptingService } from 'sql/services/scripting/scriptingService'; +import { IScriptingService } from 'sql/platform/scripting/common/scriptingService'; import { EditDataInput } from 'sql/parts/editData/common/editDataInput'; -import { IAdminService } from 'sql/parts/admin/common/adminService'; -import { IRestoreDialogController } from 'sql/parts/disasterRecovery/restore/common/restoreService'; -import { IBackupUiService } from 'sql/parts/disasterRecovery/backup/common/backupService'; +import { IAdminService } from 'sql/workbench/services/admin/common/adminService'; +import { IRestoreDialogController } from 'sql/platform/restore/common/restoreService'; +import { IBackupUiService } from 'sql/platform/backup/common/backupService'; import { IInsightsConfig } from 'sql/parts/dashboard/widgets/insights/interfaces'; import { IInsightsDialogService } from 'sql/parts/insights/common/interfaces'; -import { ConnectionManagementInfo } from 'sql/parts/connection/common/connectionManagementInfo'; -import Severity from 'vs/base/common/severity'; -import * as sqlops from 'sqlops'; -import nls = require('vs/nls'); -import os = require('os'); -import path = require('path'); +import { ConnectionManagementInfo } from 'sql/platform/connection/common/connectionManagementInfo'; import { IObjectExplorerService } from 'sql/parts/objectExplorer/common/objectExplorerService'; -import { IEditorService } from 'vs/workbench/services/editor/common/editorService'; import { QueryInput } from 'sql/parts/query/common/queryInput'; import { DashboardInput } from 'sql/parts/dashboard/dashboardInput'; import { ProfilerInput } from 'sql/parts/profiler/editor/profilerInput'; +import { IErrorMessageService } from 'sql/platform/errorMessage/common/errorMessageService'; + +import * as sqlops from 'sqlops'; + +import Severity from 'vs/base/common/severity'; +import * as nls from 'vs/nls'; +import * as path from 'vs/base/common/paths'; +import { IEditorService } from 'vs/workbench/services/editor/common/editorService'; // map for the version of SQL Server (default is 140) const scriptCompatibilityOptionMap = { diff --git a/src/sql/parts/disasterRecovery/backup/common/backupServiceImp.ts b/src/sql/workbench/parts/backup/browser/backupUiService.ts similarity index 57% rename from src/sql/parts/disasterRecovery/backup/common/backupServiceImp.ts rename to src/sql/workbench/parts/backup/browser/backupUiService.ts index 68b2810cbf..061a62e0fe 100644 --- a/src/sql/parts/disasterRecovery/backup/common/backupServiceImp.ts +++ b/src/sql/workbench/parts/backup/browser/backupUiService.ts @@ -4,85 +4,21 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; -import { IConnectionManagementService } from 'sql/parts/connection/common/connectionManagement'; + +import { Event, Emitter } from 'vs/base/common/event'; +import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; +import { TPromise } from 'vs/base/common/winjs.base'; + import * as sqlops from 'sqlops'; -import * as Constants from 'sql/common/constants'; -import * as TelemetryKeys from 'sql/common/telemetryKeys'; -import * as TelemetryUtils from 'sql/common/telemetryUtilities'; -import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry'; -import { IBackupService, TaskExecutionMode, IBackupUiService } from 'sql/parts/disasterRecovery/backup/common/backupService'; + +import { ICapabilitiesService } from 'sql/platform/capabilities/common/capabilitiesService'; +import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; +import * as ConnectionUtils from 'sql/platform/connection/common/utils'; +import { ProviderConnectionInfo } from 'sql/platform/connection/common/providerConnectionInfo'; +import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement'; import { BackupDialog } from 'sql/parts/disasterRecovery/backup/backupDialog'; import { OptionsDialog } from 'sql/base/browser/ui/modal/optionsDialog'; -import { Event, Emitter } from 'vs/base/common/event'; -import { IDashboardComponentParams } from 'sql/services/bootstrap/bootstrapParams'; -import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; -import { IPartService } from 'vs/workbench/services/part/common/partService'; -import { ICapabilitiesService } from 'sql/services/capabilities/capabilitiesService'; -import { IConnectionProfile } from 'sql/parts/connection/common/interfaces'; -import { TPromise } from 'vs/base/common/winjs.base'; -import * as ConnectionUtils from 'sql/parts/connection/common/utils'; -import { ProviderConnectionInfo } from 'sql/parts/connection/common/providerConnectionInfo'; - -export class BackupService implements IBackupService { - - public _serviceBrand: any; - private _providers: { [handle: string]: sqlops.BackupProvider; } = Object.create(null); - - constructor( - @IConnectionManagementService private _connectionService: IConnectionManagementService, - @ITelemetryService private _telemetryService: ITelemetryService - ) { - } - - /** - * Get database metadata needed to populate backup UI - */ - public getBackupConfigInfo(connectionUri: string): Thenable { - let providerId: string = this._connectionService.getProviderIdFromUri(connectionUri); - if (providerId) { - let provider = this._providers[providerId]; - if (provider) { - return provider.getBackupConfigInfo(connectionUri); - } - } - return Promise.resolve(undefined); - } - - /** - * Backup a data source using the provided connection - */ - public backup(connectionUri: string, backupInfo: { [key: string]: any }, taskExecutionMode: TaskExecutionMode): Thenable { - return new Promise((resolve, reject) => { - let providerResult = this.getProvider(connectionUri); - if (providerResult) { - TelemetryUtils.addTelemetry(this._telemetryService, TelemetryKeys.BackupCreated, { provider: providerResult.providerName }); - providerResult.provider.backup(connectionUri, backupInfo, taskExecutionMode).then(result => { - resolve(result); - }, error => { - reject(error); - }); - } else { - reject(Constants.InvalidProvider); - } - }); - } - - private getProvider(connectionUri: string): { provider: sqlops.BackupProvider, providerName: string } { - let providerId: string = this._connectionService.getProviderIdFromUri(connectionUri); - if (providerId) { - return { provider: this._providers[providerId], providerName: providerId }; - } else { - return undefined; - } - } - - /** - * Register a disaster recovery provider - */ - public registerProvider(providerId: string, provider: sqlops.BackupProvider): void { - this._providers[providerId] = provider; - } -} +import { IBackupUiService, IBackupService, TaskExecutionMode } from 'sql/platform/backup/common/backupService'; export class BackupUiService implements IBackupUiService { public _serviceBrand: any; @@ -97,7 +33,6 @@ export class BackupUiService implements IBackupUiService { constructor( @IInstantiationService private _instantiationService: IInstantiationService, - @IPartService private _partService: IPartService, @ICapabilitiesService private _capabilitiesService: ICapabilitiesService, @IBackupService private _disasterRecoveryService: IBackupService, @IConnectionManagementService private _connectionManagementService: IConnectionManagementService @@ -147,10 +82,10 @@ export class BackupUiService implements IBackupUiService { let backupOptions = this.getOptions(this._currentProvider); return new TPromise((resolve) => { let uri = this._connectionManagementService.getConnectionUri(connection) - + ProviderConnectionInfo.idSeparator - + ConnectionUtils.ConnectionUriBackupIdAttributeName - + ProviderConnectionInfo.nameValueSeparator - + BackupUiService._connectionUniqueId; + + ProviderConnectionInfo.idSeparator + + ConnectionUtils.ConnectionUriBackupIdAttributeName + + ProviderConnectionInfo.nameValueSeparator + + BackupUiService._connectionUniqueId; this._connectionUri = uri; diff --git a/src/sql/workbench/parts/connection/common/connectionViewlet.ts b/src/sql/workbench/parts/connection/common/connectionViewlet.ts new file mode 100644 index 0000000000..f9b26c22c1 --- /dev/null +++ b/src/sql/workbench/parts/connection/common/connectionViewlet.ts @@ -0,0 +1,9 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the Source EULA. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +import { IViewlet } from 'vs/workbench/common/viewlet'; + +export interface IConnectionsViewlet extends IViewlet { + search(text: string): void; +} diff --git a/src/sql/parts/objectExplorer/viewlet/connectionViewlet.ts b/src/sql/workbench/parts/connection/electron-browser/connectionViewlet.ts similarity index 88% rename from src/sql/parts/objectExplorer/viewlet/connectionViewlet.ts rename to src/sql/workbench/parts/connection/electron-browser/connectionViewlet.ts index 68eafbfe4e..928da9891b 100644 --- a/src/sql/parts/objectExplorer/viewlet/connectionViewlet.ts +++ b/src/sql/workbench/parts/connection/electron-browser/connectionViewlet.ts @@ -7,11 +7,9 @@ import 'vs/css!./media/connectionViewlet'; import * as DOM from 'vs/base/browser/dom'; -import { ThrottledDelayer } from 'vs/base/common/async'; import { TPromise } from 'vs/base/common/winjs.base'; import { Builder } from 'vs/base/browser/builder'; import { Viewlet } from 'vs/workbench/browser/viewlet'; -import { IViewletService } from 'vs/workbench/services/viewlet/browser/viewlet'; import { IAction } from 'vs/base/common/actions'; import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry'; import { IThemeService } from 'vs/platform/theme/common/themeService'; @@ -19,7 +17,7 @@ import { attachInputBoxStyler } from 'vs/platform/theme/common/styler'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; import { isPromiseCanceledError } from 'vs/base/common/errors'; import Severity from 'vs/base/common/severity'; -import { IConnectionsViewlet, IConnectionManagementService, VIEWLET_ID } from 'sql/parts/connection/common/connectionManagement'; +import { VIEWLET_ID } from 'sql/platform/connection/common/connectionManagement'; import { ServerTreeView } from 'sql/parts/objectExplorer/viewlet/serverTreeView'; import { InputBox } from 'vs/base/browser/ui/inputbox/inputBox'; import { IDisposable, dispose } from 'vs/base/common/lifecycle'; @@ -29,35 +27,29 @@ import { IObjectExplorerService } from 'sql/parts/objectExplorer/common/objectEx import { IPartService } from 'vs/workbench/services/part/common/partService'; import { INotificationService } from 'vs/platform/notification/common/notification'; import { localize } from 'vs/nls'; +import { IConnectionsViewlet } from 'sql/workbench/parts/connection/common/connectionViewlet'; export class ConnectionViewlet extends Viewlet implements IConnectionsViewlet { - private _searchDelayer: ThrottledDelayer; private _root: HTMLElement; private _searchBox: InputBox; private _toDisposeViewlet: IDisposable[] = []; private _serverTreeView: ServerTreeView; - private _viewletContainer: Builder; - private _searchBoxContainer: Builder; private _clearSearchAction: ClearSearchAction; private _addServerAction: IAction; private _addServerGroupAction: IAction; private _activeConnectionsFilterAction: ActiveConnectionsFilterAction; - private _searchTerm: string; constructor( @ITelemetryService telemetryService: ITelemetryService, @IThemeService private _themeService: IThemeService, - @IConnectionManagementService private connectionManagementService: IConnectionManagementService, @IInstantiationService private _instantiationService: IInstantiationService, - @IViewletService private viewletService: IViewletService, @INotificationService private _notificationService: INotificationService, @IObjectExplorerService private objectExplorerService: IObjectExplorerService, @IPartService partService: IPartService ) { super(VIEWLET_ID, partService, telemetryService, _themeService); - this._searchDelayer = new ThrottledDelayer(500); this._clearSearchAction = this._instantiationService.createInstance(ClearSearchAction, ClearSearchAction.ID, ClearSearchAction.LABEL, this); this._addServerAction = this._instantiationService.createInstance(AddServerAction, @@ -87,9 +79,7 @@ export class ConnectionViewlet extends Viewlet implements IConnectionsViewlet { this._root = parent; let parentBuilder = new Builder(parent); parentBuilder.div({ class: 'server-explorer-viewlet' }, (viewletContainer) => { - this._viewletContainer = viewletContainer; viewletContainer.div({ class: 'search-box' }, (searchBoxContainer) => { - this._searchBoxContainer = searchBoxContainer; let searchServerString = localize('Search server names', 'Search server names'); this._searchBox = new InputBox( searchBoxContainer.getHTMLElement(), @@ -100,7 +90,6 @@ export class ConnectionViewlet extends Viewlet implements IConnectionsViewlet { ariaLabel: searchServerString } ); - this._searchTerm = ''; this._searchBox.onDidChange(() => { this.search(this._searchBox.value); @@ -159,7 +148,6 @@ export class ConnectionViewlet extends Viewlet implements IConnectionsViewlet { } public clearSearch() { - this._searchTerm = ''; this._serverTreeView.refreshTree(); this._searchBox.value = ''; this._clearSearchAction.enabled = false; diff --git a/src/sql/parts/objectExplorer/viewlet/media/collapsed-dark.svg b/src/sql/workbench/parts/connection/electron-browser/media/collapsed-dark.svg similarity index 100% rename from src/sql/parts/objectExplorer/viewlet/media/collapsed-dark.svg rename to src/sql/workbench/parts/connection/electron-browser/media/collapsed-dark.svg diff --git a/src/sql/workbench/parts/connection/electron-browser/media/connected_active_server.svg b/src/sql/workbench/parts/connection/electron-browser/media/connected_active_server.svg new file mode 100644 index 0000000000..c8fc5dd61c --- /dev/null +++ b/src/sql/workbench/parts/connection/electron-browser/media/connected_active_server.svg @@ -0,0 +1 @@ +connected_active_server_16x16 \ No newline at end of file diff --git a/src/sql/workbench/parts/connection/electron-browser/media/connected_active_server_inverse.svg b/src/sql/workbench/parts/connection/electron-browser/media/connected_active_server_inverse.svg new file mode 100644 index 0000000000..5f9888af87 --- /dev/null +++ b/src/sql/workbench/parts/connection/electron-browser/media/connected_active_server_inverse.svg @@ -0,0 +1 @@ +connected_active_server_inverse_16x16 \ No newline at end of file diff --git a/src/sql/parts/objectExplorer/viewlet/media/connectionViewlet.css b/src/sql/workbench/parts/connection/electron-browser/media/connectionViewlet.css similarity index 100% rename from src/sql/parts/objectExplorer/viewlet/media/connectionViewlet.css rename to src/sql/workbench/parts/connection/electron-browser/media/connectionViewlet.css diff --git a/src/sql/parts/objectExplorer/viewlet/media/disconnected_server.svg b/src/sql/workbench/parts/connection/electron-browser/media/disconnected_server.svg similarity index 100% rename from src/sql/parts/objectExplorer/viewlet/media/disconnected_server.svg rename to src/sql/workbench/parts/connection/electron-browser/media/disconnected_server.svg diff --git a/src/sql/parts/objectExplorer/viewlet/media/disconnected_server_inverse.svg b/src/sql/workbench/parts/connection/electron-browser/media/disconnected_server_inverse.svg similarity index 100% rename from src/sql/parts/objectExplorer/viewlet/media/disconnected_server_inverse.svg rename to src/sql/workbench/parts/connection/electron-browser/media/disconnected_server_inverse.svg diff --git a/src/sql/parts/objectExplorer/viewlet/media/expanded-dark.svg b/src/sql/workbench/parts/connection/electron-browser/media/expanded-dark.svg similarity index 100% rename from src/sql/parts/objectExplorer/viewlet/media/expanded-dark.svg rename to src/sql/workbench/parts/connection/electron-browser/media/expanded-dark.svg diff --git a/src/sql/services/accountManagement/accountManagementService.ts b/src/sql/workbench/services/accountManagement/browser/accountManagementService.ts similarity index 98% rename from src/sql/services/accountManagement/accountManagementService.ts rename to src/sql/workbench/services/accountManagement/browser/accountManagementService.ts index c8a3942301..57e2e602fb 100644 --- a/src/sql/services/accountManagement/accountManagementService.ts +++ b/src/sql/workbench/services/accountManagement/browser/accountManagementService.ts @@ -15,12 +15,12 @@ import { IInstantiationService } from 'vs/platform/instantiation/common/instanti import { IStorageService } from 'vs/platform/storage/common/storage'; import { Memento, Scope as MementoScope } from 'vs/workbench/common/memento'; -import AccountStore from 'sql/services/accountManagement/accountStore'; +import AccountStore from 'sql/platform/accountManagement/common/accountStore'; import { AccountDialogController } from 'sql/parts/accountManagement/accountDialog/accountDialogController'; import { AutoOAuthDialogController } from 'sql/parts/accountManagement/autoOAuthDialog/autoOAuthDialogController'; import { AccountListStatusbarItem } from 'sql/parts/accountManagement/accountListStatusbar/accountListStatusbarItem'; -import { AccountProviderAddedEventParams, UpdateAccountListEventParams } from 'sql/services/accountManagement/eventTypes'; -import { IAccountManagementService } from 'sql/services/accountManagement/interfaces'; +import { AccountProviderAddedEventParams, UpdateAccountListEventParams } from 'sql/platform/accountManagement/common/eventTypes'; +import { IAccountManagementService } from 'sql/platform/accountManagement/common/interfaces'; import { Deferred } from 'sql/base/common/promise'; export class AccountManagementService implements IAccountManagementService { diff --git a/src/sql/parts/admin/common/adminService.ts b/src/sql/workbench/services/admin/common/adminService.ts similarity index 93% rename from src/sql/parts/admin/common/adminService.ts rename to src/sql/workbench/services/admin/common/adminService.ts index e44f3c6b63..b58fc5f45d 100644 --- a/src/sql/parts/admin/common/adminService.ts +++ b/src/sql/workbench/services/admin/common/adminService.ts @@ -9,14 +9,13 @@ import { localize } from 'vs/nls'; export const SERVICE_ID = 'adminService'; import { IInstantiationService, createDecorator } from 'vs/platform/instantiation/common/instantiation'; -import { ICapabilitiesService } from 'sql/services/capabilities/capabilitiesService'; -import { IConnectionManagementService } from 'sql/parts/connection/common/connectionManagement'; +import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement'; import { CreateLoginInput } from 'sql/parts/admin/security/createLoginInput'; import { TaskDialogInput } from 'sql/parts/tasks/dialog/taskDialogInput'; import { TPromise } from 'vs/base/common/winjs.base'; import { IEditorService, ACTIVE_GROUP } from 'vs/workbench/services/editor/common/editorService'; -import { IConnectionProfile } from 'sql/parts/connection/common/interfaces'; +import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; import * as sqlops from 'sqlops'; @@ -46,8 +45,7 @@ export class AdminService implements IAdminService { constructor( @IInstantiationService private _instantiationService: IInstantiationService, @IEditorService private _editorService: IEditorService, - @IConnectionManagementService private _connectionService: IConnectionManagementService, - @ICapabilitiesService private _capabilitiesService: ICapabilitiesService + @IConnectionManagementService private _connectionService: IConnectionManagementService ) { } diff --git a/src/sql/parts/commandLine/common/commandLine.ts b/src/sql/workbench/services/commandLine/common/commandLine.ts similarity index 90% rename from src/sql/parts/commandLine/common/commandLine.ts rename to src/sql/workbench/services/commandLine/common/commandLine.ts index 852dc234df..473d1e0cae 100644 --- a/src/sql/parts/commandLine/common/commandLine.ts +++ b/src/sql/workbench/services/commandLine/common/commandLine.ts @@ -11,7 +11,7 @@ export interface ICommandLineProcessing { * Interprets the various Azure Data Studio-specific command line switches and * performs the requisite tasks such as connecting to a server */ - processCommandLine() : Promise; + processCommandLine(): Promise; } export const ICommandLineProcessing = createDecorator('commandLineService'); \ No newline at end of file diff --git a/src/sql/parts/commandLine/common/commandLineService.ts b/src/sql/workbench/services/commandLine/common/commandLineService.ts similarity index 89% rename from src/sql/parts/commandLine/common/commandLineService.ts rename to src/sql/workbench/services/commandLine/common/commandLineService.ts index e2fad5b3c4..285a624223 100644 --- a/src/sql/parts/commandLine/common/commandLineService.ts +++ b/src/sql/workbench/services/commandLine/common/commandLineService.ts @@ -3,15 +3,15 @@ * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ 'use strict'; -import { ConnectionProfile } from 'sql/parts/connection/common/connectionProfile'; -import { ICommandLineProcessing } from 'sql/parts/commandLine/common/commandLine'; -import { IConnectionManagementService } from 'sql/parts/connection/common/connectionManagement'; -import { ICapabilitiesService } from 'sql/services/capabilities/capabilitiesService'; +import { ConnectionProfile } from 'sql/platform/connection/common/connectionProfile'; +import { ICommandLineProcessing } from 'sql/workbench/services/commandLine/common/commandLine'; +import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement'; +import { ICapabilitiesService } from 'sql/platform/capabilities/common/capabilitiesService'; import { IEnvironmentService } from 'vs/platform/environment/common/environment'; -import * as Constants from 'sql/parts/connection/common/constants'; +import * as Constants from 'sql/platform/connection/common/constants'; import { IQueryEditorService } from 'sql/parts/query/common/queryEditorService'; import * as platform from 'vs/platform/registry/common/platform'; -import { ConnectionProviderProperties, IConnectionProviderRegistry, Extensions as ConnectionProviderExtensions } from 'sql/workbench/parts/connection/common/connectionProviderExtension'; +import { IConnectionProviderRegistry, Extensions as ConnectionProviderExtensions } from 'sql/workbench/parts/connection/common/connectionProviderExtension'; import * as TaskUtilities from 'sql/workbench/common/taskUtilities'; import { IObjectExplorerService } from 'sql/parts/objectExplorer/common/objectExplorerService'; import { IEditorService } from 'vs/workbench/services/editor/common/editorService'; @@ -25,8 +25,8 @@ export class CommandLineService implements ICommandLineProcessing { private _commandName: string; constructor( + @ICapabilitiesService _capabilitiesService: ICapabilitiesService, @IConnectionManagementService private _connectionManagementService: IConnectionManagementService, - @ICapabilitiesService private _capabilitiesService: ICapabilitiesService, @IEnvironmentService private _environmentService: IEnvironmentService, @IQueryEditorService private _queryEditorService: IQueryEditorService, @IObjectExplorerService private _objectExplorerService: IObjectExplorerService, diff --git a/src/sql/workbench/errorMessageDialog/errorMessageDialog.ts b/src/sql/workbench/services/errorMessage/browser/errorMessageDialog.ts similarity index 100% rename from src/sql/workbench/errorMessageDialog/errorMessageDialog.ts rename to src/sql/workbench/services/errorMessage/browser/errorMessageDialog.ts diff --git a/src/sql/workbench/errorMessageDialog/errorMessageService.ts b/src/sql/workbench/services/errorMessage/browser/errorMessageService.ts similarity index 90% rename from src/sql/workbench/errorMessageDialog/errorMessageService.ts rename to src/sql/workbench/services/errorMessage/browser/errorMessageService.ts index 79b6b4c624..61f66b0dbf 100644 --- a/src/sql/workbench/errorMessageDialog/errorMessageService.ts +++ b/src/sql/workbench/services/errorMessage/browser/errorMessageService.ts @@ -8,11 +8,11 @@ import { localize } from 'vs/nls'; import Severity from 'vs/base/common/severity'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; - -import { IErrorMessageService } from 'sql/parts/connection/common/connectionManagement'; -import { ErrorMessageDialog } from 'sql/workbench/errorMessageDialog/errorMessageDialog'; import { IAction } from 'vs/base/common/actions'; +import { ErrorMessageDialog } from 'sql/workbench/services/errorMessage/browser/errorMessageDialog'; +import { IErrorMessageService } from 'sql/platform/errorMessage/common/errorMessageService'; + export class ErrorMessageService implements IErrorMessageService { _serviceBrand: any; diff --git a/src/sql/workbench/errorMessageDialog/media/errorMessageDialog.css b/src/sql/workbench/services/errorMessage/browser/media/errorMessageDialog.css similarity index 100% rename from src/sql/workbench/errorMessageDialog/media/errorMessageDialog.css rename to src/sql/workbench/services/errorMessage/browser/media/errorMessageDialog.css diff --git a/src/sql/services/notebook/notebookRegistry.ts b/src/sql/workbench/services/notebook/common/notebookRegistry.ts similarity index 97% rename from src/sql/services/notebook/notebookRegistry.ts rename to src/sql/workbench/services/notebook/common/notebookRegistry.ts index c065c4a909..ae909b0e16 100644 --- a/src/sql/services/notebook/notebookRegistry.ts +++ b/src/sql/workbench/services/notebook/common/notebookRegistry.ts @@ -83,7 +83,7 @@ class NotebookProviderRegistry implements INotebookProviderRegistry { // Note: this method intentionally overrides default provider for a file type. // This means that any built-in provider will be overridden by registered extensions this.providerIdToRegistration.set(registration.provider, registration); - this._onNewRegistration.fire( { id: registration.provider, registration: registration }); + this._onNewRegistration.fire({ id: registration.provider, registration: registration }); } public get registrations(): NotebookProviderRegistration[] { diff --git a/src/sql/services/notebook/notebookService.ts b/src/sql/workbench/services/notebook/common/notebookService.ts similarity index 97% rename from src/sql/services/notebook/notebookService.ts rename to src/sql/workbench/services/notebook/common/notebookService.ts index 7dc380f240..789da13db5 100644 --- a/src/sql/services/notebook/notebookService.ts +++ b/src/sql/workbench/services/notebook/common/notebookService.ts @@ -13,7 +13,7 @@ import URI from 'vs/base/common/uri'; import { IBootstrapParams } from 'sql/services/bootstrap/bootstrapService'; import { RenderMimeRegistry } from 'sql/parts/notebook/outputs/registry'; import { ModelFactory } from 'sql/parts/notebook/models/modelFactory'; -import { IConnectionProfile } from 'sql/parts/connection/common/interfaces'; +import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; import { NotebookInput } from 'sql/parts/notebook/notebookInput'; import { ISingleNotebookEditOperation } from 'sql/workbench/api/common/sqlExtHostTypes'; import { ICellModel, INotebookModel } from 'sql/parts/notebook/models/modelInterfaces'; diff --git a/src/sql/services/notebook/notebookServiceImpl.ts b/src/sql/workbench/services/notebook/common/notebookServiceImpl.ts similarity index 96% rename from src/sql/services/notebook/notebookServiceImpl.ts rename to src/sql/workbench/services/notebook/common/notebookServiceImpl.ts index ccf0a99485..2e9743362b 100644 --- a/src/sql/services/notebook/notebookServiceImpl.ts +++ b/src/sql/workbench/services/notebook/common/notebookServiceImpl.ts @@ -13,12 +13,12 @@ import { Registry } from 'vs/platform/registry/common/platform'; import { INotebookService, INotebookManager, INotebookProvider, DEFAULT_NOTEBOOK_PROVIDER, DEFAULT_NOTEBOOK_FILETYPE, INotebookEditor, SQL_NOTEBOOK_PROVIDER -} from 'sql/services/notebook/notebookService'; +} from 'sql/workbench/services/notebook/common/notebookService'; import { RenderMimeRegistry } from 'sql/parts/notebook/outputs/registry'; import { standardRendererFactories } from 'sql/parts/notebook/outputs/factories'; -import { LocalContentManager } from 'sql/services/notebook/localContentManager'; -import { SessionManager } from 'sql/services/notebook/sessionManager'; -import { Extensions, INotebookProviderRegistry, NotebookProviderRegistration } from 'sql/services/notebook/notebookRegistry'; +import { LocalContentManager } from 'sql/workbench/services/notebook/node/localContentManager'; +import { SessionManager } from 'sql/workbench/services/notebook/common/sessionManager'; +import { Extensions, INotebookProviderRegistry, NotebookProviderRegistration } from 'sql/workbench/services/notebook/common/notebookRegistry'; import { Emitter, Event } from 'vs/base/common/event'; import { Memento } from 'vs/workbench/common/memento'; import { IStorageService } from 'vs/platform/storage/common/storage'; @@ -27,7 +27,7 @@ import { IExtensionManagementService, IExtensionIdentifier } from 'vs/platform/e import { Disposable } from 'vs/base/common/lifecycle'; import { getIdFromLocalExtensionId } from 'vs/platform/extensionManagement/common/extensionManagementUtil'; import { Deferred } from 'sql/base/common/promise'; -import { SqlSessionManager } from 'sql/services/notebook/sqlSessionManager'; +import { SqlSessionManager } from 'sql/workbench/services/notebook/common/sqlSessionManager'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; import { sqlNotebooksEnabled } from 'sql/parts/notebook/notebookUtils'; @@ -94,7 +94,7 @@ export class NotebookService extends Disposable implements INotebookService { this.registerBuiltInProvider(); if (extensionService) { - extensionService.whenInstalledExtensionsRegistered().then(() => { + extensionService.whenInstalledExtensionsRegistered().then(() => { this.cleanupProviders(); this._isRegistrationComplete = true; this._registrationComplete.resolve(); @@ -232,8 +232,7 @@ export class NotebookService extends Disposable implements INotebookService { renameNotebookEditor(oldUri: URI, newUri: URI, currentEditor: INotebookEditor): void { let oldUriKey = oldUri.toString(); - if(this._editors.has(oldUriKey)) - { + if (this._editors.has(oldUriKey)) { this._editors.delete(oldUriKey); currentEditor.notebookParams.notebookUri = newUri; this._editors.set(newUri.toString(), currentEditor); diff --git a/src/sql/services/notebook/sessionManager.ts b/src/sql/workbench/services/notebook/common/sessionManager.ts similarity index 97% rename from src/sql/services/notebook/sessionManager.ts rename to src/sql/workbench/services/notebook/common/sessionManager.ts index b177ef448d..eae63f7794 100644 --- a/src/sql/services/notebook/sessionManager.ts +++ b/src/sql/workbench/services/notebook/common/sessionManager.ts @@ -141,7 +141,7 @@ class EmptyKernel implements nb.IKernel { } requestComplete(content: nb.ICompleteRequest): Thenable { - let response: Partial = { }; + let response: Partial = {}; return Promise.resolve(response as nb.ICompleteReplyMsg); } @@ -192,11 +192,11 @@ export class EmptyFuture implements FutureInternal { let msg: nb.IIOPubMessage = { channel: 'iopub', type: 'iopub', - header: { + header: { msg_id: '0', msg_type: 'error' }, - content: { + content: { ename: localize('errorName', 'Error'), evalue: runNotebookDisabled, output_type: 'error' diff --git a/src/sql/services/notebook/sqlSessionManager.ts b/src/sql/workbench/services/notebook/common/sqlSessionManager.ts similarity index 89% rename from src/sql/services/notebook/sqlSessionManager.ts rename to src/sql/workbench/services/notebook/common/sqlSessionManager.ts index 8444eacc4e..6895263d43 100644 --- a/src/sql/services/notebook/sqlSessionManager.ts +++ b/src/sql/workbench/services/notebook/common/sqlSessionManager.ts @@ -7,14 +7,15 @@ import { nb, QueryExecuteSubsetResult, IDbColumn, DbCellValue } from 'sqlops'; import { localize } from 'vs/nls'; import { FutureInternal } from 'sql/parts/notebook/models/modelInterfaces'; -import QueryRunner, { EventType } from 'sql/parts/query/execution/queryRunner'; -import { IConnectionManagementService, IErrorMessageService } from 'sql/parts/connection/common/connectionManagement'; +import QueryRunner, { EventType } from 'sql/platform/query/common/queryRunner'; +import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; import Severity from 'vs/base/common/severity'; -import * as Utils from 'sql/parts/connection/common/utils'; +import * as Utils from 'sql/platform/connection/common/utils'; import { Deferred } from 'sql/base/common/promise'; import { Disposable } from 'vs/base/common/lifecycle'; -import { mssqlProviderName } from 'sql/parts/connection/common/constants'; +import { mssqlProviderName } from 'sql/platform/connection/common/constants'; +import { IErrorMessageService } from 'sql/platform/errorMessage/common/errorMessageService'; export const sqlKernel: string = localize('sqlKernel', 'SQL'); export const sqlKernelError: string = localize("sqlKernelError", "SQL kernel error"); @@ -31,7 +32,7 @@ export interface SQLData { } export class SqlSessionManager implements nb.SessionManager { - constructor(private _instantiationService: IInstantiationService) {} + constructor(private _instantiationService: IInstantiationService) { } public get isReady(): boolean { return true; @@ -113,9 +114,9 @@ class SqlKernel extends Disposable implements nb.IKernel { private _columns: IDbColumn[]; private _rows: DbCellValue[][]; - constructor(@IConnectionManagementService private _connectionManagementService: IConnectionManagementService, - @IInstantiationService private _instantiationService: IInstantiationService, - @IErrorMessageService private _errorMessageService: IErrorMessageService) { + constructor( @IConnectionManagementService private _connectionManagementService: IConnectionManagementService, + @IInstantiationService private _instantiationService: IInstantiationService, + @IErrorMessageService private _errorMessageService: IErrorMessageService) { super(); } @@ -170,8 +171,7 @@ class SqlKernel extends Disposable implements nb.IKernel { let connectionProfile = connections.find(connection => connection.providerName === mssqlProviderName); let connectionUri = Utils.generateUri(connectionProfile, 'notebook'); this._queryRunner = this._instantiationService.createInstance(QueryRunner, connectionUri, undefined); - this._connectionManagementService.connect(connectionProfile, connectionUri).then((result) => - { + this._connectionManagementService.connect(connectionProfile, connectionUri).then((result) => { this.addQueryEventListeners(this._queryRunner); this._queryRunner.runQuery(content.code); }); @@ -181,7 +181,7 @@ class SqlKernel extends Disposable implements nb.IKernel { } requestComplete(content: nb.ICompleteRequest): Thenable { - let response: Partial = { }; + let response: Partial = {}; return Promise.resolve(response as nb.ICompleteReplyMsg); } @@ -240,7 +240,7 @@ export class SQLFuture extends Disposable implements FutureInternal { } get done(): Thenable { - let deferred = new Deferred (); + let deferred = new Deferred(); try { this._register(this._queryRunner.onBatchEnd(e => { let msg: nb.IShellMessage = { @@ -273,7 +273,7 @@ export class SQLFuture extends Disposable implements FutureInternal { setIOPubHandler(handler: nb.MessageHandler): void { this._register(this._queryRunner.onBatchEnd(batch => { this._queryRunner.getQueryRows(0, batch.resultSetSummaries[0].rowCount, 0, 0).then(d => { - let data:SQLData = { + let data: SQLData = { columns: batch.resultSetSummaries[0].columnInfo.map(c => c.columnName), rows: d.resultSubset.rows.map(r => r.map(c => c.displayValue)) }; @@ -283,14 +283,14 @@ export class SQLFuture extends Disposable implements FutureInternal { let hrow = table.insertRow(); // headers for (let column of data.columns) { - var cell = hrow.insertCell(); + let cell = hrow.insertCell(); cell.innerHTML = column; } for (let row in data.rows) { let hrow = table.insertRow(); for (let column in data.columns) { - var cell = hrow.insertCell(); + let cell = hrow.insertCell(); cell.innerHTML = data.rows[row][column]; } } @@ -299,15 +299,15 @@ export class SQLFuture extends Disposable implements FutureInternal { let msg: nb.IIOPubMessage = { channel: 'iopub', type: 'iopub', - header: { + header: { msg_id: undefined, msg_type: 'execute_result' }, - content: { + content: { output_type: 'execute_result', metadata: {}, execution_count: 0, - data: { 'text/html' : tableHtml}, + data: { 'text/html': tableHtml }, }, metadata: undefined, parent_header: undefined diff --git a/src/sql/services/notebook/localContentManager.ts b/src/sql/workbench/services/notebook/node/localContentManager.ts similarity index 97% rename from src/sql/services/notebook/localContentManager.ts rename to src/sql/workbench/services/notebook/node/localContentManager.ts index c70391aa76..090108de59 100644 --- a/src/sql/services/notebook/localContentManager.ts +++ b/src/sql/workbench/services/notebook/node/localContentManager.ts @@ -235,14 +235,14 @@ namespace v3 { const createOutput = (output: Output): nb.ICellOutput => { switch (output.output_type) { case 'pyout': - return { + return { output_type: OutputTypes.ExecuteResult, execution_count: output.prompt_number, data: createMimeBundle(output), metadata: output.metadata }; case 'display_data': - return { + return { output_type: OutputTypes.DisplayData, data: createMimeBundle(output), metadata: output.metadata @@ -250,13 +250,13 @@ namespace v3 { case 'stream': // Default to stdout in all cases unless it's stderr const name = output.stream === 'stderr' ? 'stderr' : 'stdout'; - return { + return { output_type: OutputTypes.Stream, name: name, text: v4.demultiline(output.text) }; case 'pyerr': - return { + return { output_type: OutputTypes.Error, ename: output.ename, evalue: output.evalue, @@ -268,7 +268,7 @@ namespace v3 { }; function createCodeCell(cell: CodeCell): nb.ICellContents { - return { + return { cell_type: cell.cell_type, source: v4.demultiline(cell.input), outputs: cell.outputs.map(createOutput), @@ -279,7 +279,7 @@ namespace v3 { function createHeadingCell(cell: HeadingCell): nb.ICellContents { // v3 heading cells are just markdown cells in v4+ - return { + return { cell_type: 'markdown', source: Array.isArray(cell.source) ? v4.demultiline( @@ -307,7 +307,7 @@ namespace v3 { pdf: 'application/pdf' }; type MimeTypeKey = keyof typeof VALID_MIMETYPES; - type MimePayload = { [P in MimeTypeKey]?: nb.MultilineString }; + type MimePayload = {[P in MimeTypeKey]?: nb.MultilineString }; interface MimeOutput extends MimePayload { output_type: T; diff --git a/src/sql/parts/profiler/service/interfaces.ts b/src/sql/workbench/services/profiler/common/interfaces.ts similarity index 97% rename from src/sql/parts/profiler/service/interfaces.ts rename to src/sql/workbench/services/profiler/common/interfaces.ts index 68c5d748e2..f94b639a80 100644 --- a/src/sql/parts/profiler/service/interfaces.ts +++ b/src/sql/workbench/services/profiler/common/interfaces.ts @@ -3,12 +3,12 @@ * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { IConnectionProfile } from 'sql/parts/connection/common/interfaces'; +import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; import { ProfilerInput } from 'sql/parts/profiler/editor/profilerInput'; import { createDecorator } from 'vs/platform/instantiation/common/instantiation'; import * as sqlops from 'sqlops'; -import { INewProfilerState } from '../editor/profilerState'; +import { INewProfilerState } from 'sql/parts/profiler/editor/profilerState'; const PROFILER_SERVICE_ID = 'profilerService'; export const IProfilerService = createDecorator(PROFILER_SERVICE_ID); diff --git a/src/sql/parts/profiler/service/profilerService.ts b/src/sql/workbench/services/profiler/common/profilerService.ts similarity index 98% rename from src/sql/parts/profiler/service/profilerService.ts rename to src/sql/workbench/services/profiler/common/profilerService.ts index debe8286ca..3f1c3ddaee 100644 --- a/src/sql/parts/profiler/service/profilerService.ts +++ b/src/sql/workbench/services/profiler/common/profilerService.ts @@ -3,12 +3,12 @@ * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { IConnectionManagementService, IConnectionCompletionOptions, ConnectionType, RunQueryOnConnectionMode } from 'sql/parts/connection/common/connectionManagement'; +import { IConnectionManagementService, IConnectionCompletionOptions, ConnectionType, RunQueryOnConnectionMode } from 'sql/platform/connection/common/connectionManagement'; import { ProfilerSessionID, IProfilerSession, IProfilerService, IProfilerViewTemplate, IProfilerSessionTemplate, PROFILER_SETTINGS, IProfilerSettings } from './interfaces'; -import { IConnectionProfile } from 'sql/parts/connection/common/interfaces'; +import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; import { ProfilerInput } from 'sql/parts/profiler/editor/profilerInput'; import { ProfilerColumnEditorDialog } from 'sql/parts/profiler/dialog/profilerColumnEditorDialog'; diff --git a/src/sql/parts/accountManagement/common/resourceProviderService.ts b/src/sql/workbench/services/resourceProvider/browser/resourceProviderService.ts similarity index 96% rename from src/sql/parts/accountManagement/common/resourceProviderService.ts rename to src/sql/workbench/services/resourceProvider/browser/resourceProviderService.ts index 65d737ef80..e6ec8c8d7b 100644 --- a/src/sql/parts/accountManagement/common/resourceProviderService.ts +++ b/src/sql/workbench/services/resourceProvider/browser/resourceProviderService.ts @@ -7,8 +7,8 @@ import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; -import { IConnectionProfile } from 'sql/parts/connection/common/interfaces'; -import { IResourceProviderService, IHandleFirewallRuleResult } from 'sql/parts/accountManagement/common/interfaces'; +import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; +import { IResourceProviderService, IHandleFirewallRuleResult } from 'sql/workbench/services/resourceProvider/common/resourceProviderService'; import * as Constants from 'sql/common/constants'; import * as TelemetryKeys from 'sql/common/telemetryKeys'; import * as TelemetryUtils from 'sql/common/telemetryUtilities'; diff --git a/src/sql/parts/accountManagement/common/interfaces.ts b/src/sql/workbench/services/resourceProvider/common/resourceProviderService.ts similarity index 74% rename from src/sql/parts/accountManagement/common/interfaces.ts rename to src/sql/workbench/services/resourceProvider/common/resourceProviderService.ts index 53e0d4a8cc..e4673d38ea 100644 --- a/src/sql/parts/accountManagement/common/interfaces.ts +++ b/src/sql/workbench/services/resourceProvider/common/resourceProviderService.ts @@ -6,10 +6,10 @@ 'use strict'; import { createDecorator } from 'vs/platform/instantiation/common/instantiation'; -import { Event } from 'vs/base/common/event'; + import * as sqlops from 'sqlops'; -import { IConnectionProfile } from 'sql/parts/connection/common/interfaces'; +import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; export const SERVICE_ID = 'resourceProviderService'; export const IResourceProviderService = createDecorator(SERVICE_ID); @@ -48,14 +48,3 @@ export interface IResourceProviderService { */ showFirewallRuleDialog(connection: IConnectionProfile, ipAddress: string, resourceProviderId: string): Promise; } - -export const IAccountPickerService = createDecorator('AccountPickerService'); -export interface IAccountPickerService { - _serviceBrand: any; - renderAccountPicker(container: HTMLElement): void; - addAccountCompleteEvent: Event; - addAccountErrorEvent: Event; - addAccountStartEvent: Event; - onAccountSelectionChangeEvent: Event; - selectedAccount: sqlops.Account; -} diff --git a/src/sql/parts/objectExplorer/serverGroupDialog/serverGroupController.ts b/src/sql/workbench/services/serverGroup/browser/serverGroupController.ts similarity index 91% rename from src/sql/parts/objectExplorer/serverGroupDialog/serverGroupController.ts rename to src/sql/workbench/services/serverGroup/browser/serverGroupController.ts index eca5ea4ee7..e2155da5f2 100644 --- a/src/sql/parts/objectExplorer/serverGroupDialog/serverGroupController.ts +++ b/src/sql/workbench/services/serverGroup/browser/serverGroupController.ts @@ -4,19 +4,18 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; -import { - IConnectionManagementService, IErrorMessageService, - IServerGroupController, IServerGroupDialogCallbacks -} from 'sql/parts/connection/common/connectionManagement'; -import { IPartService } from 'vs/workbench/services/part/common/partService'; -import { ServerGroupDialog } from 'sql/parts/objectExplorer/serverGroupDialog/serverGroupDialog'; -import { ServerGroupViewModel } from 'sql/parts/objectExplorer/serverGroupDialog/serverGroupViewModel'; import { TPromise } from 'vs/base/common/winjs.base'; -import { ConnectionProfileGroup, IConnectionProfileGroup } from 'sql/parts/connection/common/connectionProfileGroup'; import Severity from 'vs/base/common/severity'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; import { IConfigurationService } from 'vs/platform/configuration/common/configuration'; -import { SERVER_GROUP_CONFIG, SERVER_GROUP_COLORS_CONFIG } from './serverGroup.contribution'; + +import { SERVER_GROUP_CONFIG, SERVER_GROUP_COLORS_CONFIG } from 'sql/parts/objectExplorer/serverGroupDialog/serverGroup.contribution'; +import { IErrorMessageService } from 'sql/platform/errorMessage/common/errorMessageService'; +import { IServerGroupController, IServerGroupDialogCallbacks } from 'sql/platform/serverGroup/common/serverGroupController'; +import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement'; +import { ServerGroupDialog } from 'sql/parts/objectExplorer/serverGroupDialog/serverGroupDialog'; +import { ServerGroupViewModel } from 'sql/parts/objectExplorer/serverGroupDialog/serverGroupViewModel'; +import { ConnectionProfileGroup, IConnectionProfileGroup } from 'sql/platform/connection/common/connectionProfileGroup'; export class ServerGroupController implements IServerGroupController { _serviceBrand: any; @@ -28,7 +27,6 @@ export class ServerGroupController implements IServerGroupController { private _viewModel: ServerGroupViewModel; constructor( - @IPartService private _partService: IPartService, @IErrorMessageService private _errorMessageService: IErrorMessageService, @IInstantiationService private _instantiationService: IInstantiationService, @IConfigurationService private _configurationService: IConfigurationService diff --git a/src/sql/workbench/update/releaseNotes.ts b/src/sql/workbench/update/releaseNotes.ts index fcc8ca45a3..e31aa4163a 100644 --- a/src/sql/workbench/update/releaseNotes.ts +++ b/src/sql/workbench/update/releaseNotes.ts @@ -10,15 +10,10 @@ import { TPromise } from 'vs/base/common/winjs.base'; import { Action } from 'vs/base/common/actions'; import pkg from 'vs/platform/node/package'; import product from 'vs/platform/node/product'; -import { IEditorService } from 'vs/workbench/services/editor/common/editorService'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; -import { IWorkbenchContribution } from 'vs/workbench/common/contributions'; -import { IStorageService, StorageScope } from 'vs/platform/storage/common/storage'; import URI from 'vs/base/common/uri'; import { IOpenerService } from 'vs/platform/opener/common/opener'; import { AbstractShowReleaseNotesAction } from 'vs/workbench/parts/update/electron-browser/update'; -import { INotification, INotificationService, INotificationActions } from 'vs/platform/notification/common/notification'; -import Severity from 'vs/base/common/severity'; export class OpenGettingStartedInBrowserAction extends Action { diff --git a/src/sqltest/parts/accountManagement/accountPickerService.test.ts b/src/sqltest/parts/accountManagement/accountPickerService.test.ts index 7b5df79229..ba318a238a 100644 --- a/src/sqltest/parts/accountManagement/accountPickerService.test.ts +++ b/src/sqltest/parts/accountManagement/accountPickerService.test.ts @@ -9,9 +9,9 @@ import * as assert from 'assert'; import * as TypeMoq from 'typemoq'; import { EventVerifierSingle } from 'sqltest/utils/eventVerifier'; import { Emitter } from 'vs/base/common/event'; -import { AccountPicker } from 'sql/parts/accountManagement/accountPicker/accountPicker'; -import { AccountPickerService } from 'sql/parts/accountManagement/accountPicker/accountPickerService'; -import { AccountPickerViewModel } from 'sql/parts/accountManagement/accountPicker/accountPickerViewModel'; +import { AccountPicker } from 'sql/platform/accountManagement/browser/accountPicker'; +import { AccountPickerService } from 'sql/platform/accountManagement/browser/accountPickerService'; +import { AccountPickerViewModel } from 'sql/platform/accountManagement/common/accountPickerViewModel'; import { AccountManagementTestService } from 'sqltest/stubs/accountManagementStubs'; import { InstantiationService } from 'vs/platform/instantiation/common/instantiationService'; diff --git a/src/sqltest/parts/accountManagement/accountPickerViewModel.test.ts b/src/sqltest/parts/accountManagement/accountPickerViewModel.test.ts index 90d906fcdc..1e01b3759a 100644 --- a/src/sqltest/parts/accountManagement/accountPickerViewModel.test.ts +++ b/src/sqltest/parts/accountManagement/accountPickerViewModel.test.ts @@ -9,8 +9,8 @@ import * as assert from 'assert'; import * as TypeMoq from 'typemoq'; import { EventVerifierSingle } from 'sqltest/utils/eventVerifier'; import { Emitter } from 'vs/base/common/event'; -import { AccountPickerViewModel } from 'sql/parts/accountManagement/accountPicker/accountPickerViewModel'; -import { UpdateAccountListEventParams } from 'sql/services/accountManagement/eventTypes'; +import { AccountPickerViewModel } from 'sql/platform/accountManagement/common/accountPickerViewModel'; +import { UpdateAccountListEventParams } from 'sql/platform/accountManagement/common/eventTypes'; import { AccountManagementTestService } from 'sqltest/stubs/accountManagementStubs'; // SUITE STATE ///////////////////////////////////////////////////////////// diff --git a/src/sqltest/parts/accountManagement/accountViewModel.test.ts b/src/sqltest/parts/accountManagement/accountViewModel.test.ts index b6406f3b53..ed1b279b26 100644 --- a/src/sqltest/parts/accountManagement/accountViewModel.test.ts +++ b/src/sqltest/parts/accountManagement/accountViewModel.test.ts @@ -11,7 +11,7 @@ import * as TypeMoq from 'typemoq'; import { EventVerifierSingle } from 'sqltest/utils/eventVerifier'; import { Emitter } from 'vs/base/common/event'; import { AccountViewModel } from 'sql/parts/accountManagement/accountDialog/accountViewModel'; -import { AccountProviderAddedEventParams, UpdateAccountListEventParams } from 'sql/services/accountManagement/eventTypes'; +import { AccountProviderAddedEventParams, UpdateAccountListEventParams } from 'sql/platform/accountManagement/common/eventTypes'; import { AccountManagementTestService } from 'sqltest/stubs/accountManagementStubs'; // SUITE STATE ///////////////////////////////////////////////////////////// diff --git a/src/sqltest/parts/accountManagement/firewallRuleDialogController.test.ts b/src/sqltest/parts/accountManagement/firewallRuleDialogController.test.ts index 30ee9bbd97..10fed90f17 100644 --- a/src/sqltest/parts/accountManagement/firewallRuleDialogController.test.ts +++ b/src/sqltest/parts/accountManagement/firewallRuleDialogController.test.ts @@ -7,7 +7,7 @@ import * as sqlops from 'sqlops'; import * as TypeMoq from 'typemoq'; import { Emitter } from 'vs/base/common/event'; -import { IConnectionProfile } from 'sql/parts/connection/common/interfaces'; +import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; import { FirewallRuleDialog } from 'sql/parts/accountManagement/firewallRuleDialog/firewallRuleDialog'; import { FirewallRuleViewModel } from 'sql/parts/accountManagement/firewallRuleDialog/firewallRuleViewModel'; import { FirewallRuleDialogController } from 'sql/parts/accountManagement/firewallRuleDialog/firewallRuleDialogController'; diff --git a/src/sqltest/parts/admin/adminService.test.ts b/src/sqltest/parts/admin/adminService.test.ts index a293038eea..55924f9c35 100644 --- a/src/sqltest/parts/admin/adminService.test.ts +++ b/src/sqltest/parts/admin/adminService.test.ts @@ -5,18 +5,14 @@ 'use strict'; -import * as assert from 'assert'; -import * as sqlops from 'sqlops'; -import * as TypeMoq from 'typemoq'; - -import { AdminService } from 'sql/parts/admin/common/adminService'; +import { AdminService } from 'sql/workbench/services/admin/common/adminService'; suite('SQL AdminService tests', () => { let adminService: AdminService; setup(() => { adminService = new AdminService( - undefined, undefined, undefined, undefined + undefined, undefined, undefined ); }); diff --git a/src/sqltest/parts/commandLine/commandLineService.test.ts b/src/sqltest/parts/commandLine/commandLineService.test.ts index d42426b774..7372a12b75 100644 --- a/src/sqltest/parts/commandLine/commandLineService.test.ts +++ b/src/sqltest/parts/commandLine/commandLineService.test.ts @@ -4,33 +4,24 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; -import * as Constants from 'sql/parts/connection/common/constants'; -import * as Utils from 'sql/parts/connection/common/utils'; -import { IConnectionProfile } from 'sql/parts/connection/common/interfaces'; -import * as sqlops from 'sqlops'; import { TPromise } from 'vs/base/common/winjs.base'; import * as assert from 'assert'; import * as TypeMoq from 'typemoq'; -import { ConnectionProfile } from 'sql/parts/connection/common/connectionProfile'; -import { CommandLineService } from 'sql/parts/commandLine/common/commandLineService'; +import { ConnectionProfile } from 'sql/platform/connection/common/connectionProfile'; +import { CommandLineService } from 'sql/workbench/services/commandLine/common/commandLineService'; import { EnvironmentService } from 'vs/platform/environment/node/environmentService'; import { IEnvironmentService, ParsedArgs } from 'vs/platform/environment/common/environment'; -import { CapabilitiesService, ICapabilitiesService } from 'sql/services/capabilities/capabilitiesService'; +import { ICapabilitiesService } from 'sql/platform/capabilities/common/capabilitiesService'; import { CapabilitiesTestService } from 'sqltest/stubs/capabilitiesTestService'; import { QueryEditorService } from 'sql/parts/query/services/queryEditorService'; import { IEditorService } from 'vs/workbench/services/editor/common/editorService'; import { ObjectExplorerService } from 'sql/parts/objectExplorer/common/objectExplorerService'; -import { - IConnectionManagementService, IConnectionDialogService, INewConnectionParams, - ConnectionType, IConnectableInput, IConnectionCompletionOptions, IConnectionCallbacks, - IConnectionParams, IConnectionResult, IServerGroupController, IServerGroupDialogCallbacks, - RunQueryOnConnectionMode -} from 'sql/parts/connection/common/connectionManagement'; -import { ConnectionStore } from 'sql/parts/connection/common/connectionStore'; +import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement'; +import { ConnectionStore } from 'sql/platform/connection/common/connectionStore'; import { TestConnectionManagementService } from 'sqltest/stubs/connectionManagementService.test'; -import { ICommandService, ICommandEvent, CommandsRegistry } from 'vs/platform/commands/common/commands'; +import { ICommandService } from 'vs/platform/commands/common/commands'; import { TestCommandService } from 'vs/editor/test/browser/editorTestServices'; import { WorkspaceConfigurationTestService } from 'sqltest/stubs/workspaceConfigurationTestService'; import { IWorkspaceConfigurationService } from 'vs/workbench/services/configuration/common/configuration'; @@ -120,8 +111,8 @@ suite('commandLineService tests', () => { commandService?: ICommandService ): CommandLineService { let service = new CommandLineService( - connectionManagementService, capabilitiesService, + connectionManagementService, environmentService, undefined, undefined, diff --git a/src/sqltest/parts/connection/connectionConfig.test.ts b/src/sqltest/parts/connection/connectionConfig.test.ts index b190847e04..01348e6c9e 100644 --- a/src/sqltest/parts/connection/connectionConfig.test.ts +++ b/src/sqltest/parts/connection/connectionConfig.test.ts @@ -7,17 +7,17 @@ import * as TypeMoq from 'typemoq'; -import { ConnectionConfig, ISaveGroupResult } from 'sql/parts/connection/common/connectionConfig'; -import { IConnectionProfile, IConnectionProfileStore } from 'sql/parts/connection/common/interfaces'; -import { ConnectionProfile } from 'sql/parts/connection/common/connectionProfile'; +import { ConnectionConfig, ISaveGroupResult } from 'sql/platform/connection/common/connectionConfig'; +import { IConnectionProfile, IConnectionProfileStore } from 'sql/platform/connection/common/interfaces'; +import { ConnectionProfile } from 'sql/platform/connection/common/connectionProfile'; import { ConfigurationTarget } from 'vs/platform/configuration/common/configuration'; import { WorkspaceConfigurationTestService } from 'sqltest/stubs/workspaceConfigurationTestService'; import { IConfigurationValue, ConfigurationEditingService } from 'vs/workbench/services/configuration/node/configurationEditingService'; -import * as Constants from 'sql/parts/connection/common/constants'; -import { IConnectionProfileGroup, ConnectionProfileGroup } from 'sql/parts/connection/common/connectionProfileGroup'; +import * as Constants from 'sql/platform/connection/common/constants'; +import { IConnectionProfileGroup, ConnectionProfileGroup } from 'sql/platform/connection/common/connectionProfileGroup'; import { TPromise } from 'vs/base/common/winjs.base'; import * as assert from 'assert'; -import { ProviderFeatures, ICapabilitiesService } from 'sql/services/capabilities/capabilitiesService'; +import { ProviderFeatures, ICapabilitiesService } from 'sql/platform/capabilities/common/capabilitiesService'; import * as sqlops from 'sqlops'; import { Emitter } from 'vs/base/common/event'; import { ConnectionOptionSpecialType, ServiceOptionType } from 'sql/workbench/api/common/sqlExtHostTypes'; diff --git a/src/sqltest/parts/connection/connectionDialogService.test.ts b/src/sqltest/parts/connection/connectionDialogService.test.ts index f660f9e7d1..3314557a69 100644 --- a/src/sqltest/parts/connection/connectionDialogService.test.ts +++ b/src/sqltest/parts/connection/connectionDialogService.test.ts @@ -7,8 +7,8 @@ import { ConnectionDialogService } from 'sql/parts/connection/connectionDialog/connectionDialogService'; import { ConnectionDialogWidget } from 'sql/parts/connection/connectionDialog/connectionDialogWidget'; -import { ConnectionManagementService } from 'sql/parts/connection/common/connectionManagementService'; -import { ConnectionType, IConnectableInput, IConnectionResult, INewConnectionParams } from 'sql/parts/connection/common/connectionManagement'; +import { ConnectionManagementService } from 'sql/platform/connection/common/connectionManagementService'; +import { ConnectionType, IConnectableInput, IConnectionResult, INewConnectionParams } from 'sql/platform/connection/common/connectionManagement'; import { ContextKeyServiceStub } from 'sqltest/stubs/contextKeyServiceStub'; import { ErrorMessageServiceStub } from 'sqltest/stubs/errorMessageServiceStub'; diff --git a/src/sqltest/parts/connection/connectionManagementService.test.ts b/src/sqltest/parts/connection/connectionManagementService.test.ts index 8af840919d..92ad618097 100644 --- a/src/sqltest/parts/connection/connectionManagementService.test.ts +++ b/src/sqltest/parts/connection/connectionManagementService.test.ts @@ -6,20 +6,20 @@ 'use strict'; import { ConnectionDialogTestService } from 'sqltest/stubs/connectionDialogTestService'; -import { ConnectionManagementService } from 'sql/parts/connection/common/connectionManagementService'; -import { ConnectionStatusManager } from 'sql/parts/connection/common/connectionStatusManager'; -import { ConnectionStore } from 'sql/parts/connection/common/connectionStore'; +import { ConnectionManagementService } from 'sql/platform/connection/common/connectionManagementService'; +import { ConnectionStatusManager } from 'sql/platform/connection/common/connectionStatusManager'; +import { ConnectionStore } from 'sql/platform/connection/common/connectionStore'; import { INewConnectionParams, ConnectionType, IConnectionCompletionOptions, IConnectionResult, RunQueryOnConnectionMode -} from 'sql/parts/connection/common/connectionManagement'; -import * as Constants from 'sql/parts/connection/common/constants'; -import * as Utils from 'sql/parts/connection/common/utils'; -import { IHandleFirewallRuleResult } from 'sql/parts/accountManagement/common/interfaces'; +} from 'sql/platform/connection/common/connectionManagement'; +import * as Constants from 'sql/platform/connection/common/constants'; +import * as Utils from 'sql/platform/connection/common/utils'; +import { IHandleFirewallRuleResult } from 'sql/workbench/services/resourceProvider/common/resourceProviderService'; import { WorkbenchEditorTestService } from 'sqltest/stubs/workbenchEditorTestService'; -import { IConnectionProfile } from 'sql/parts/connection/common/interfaces'; +import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; import { EditorGroupTestService } from 'sqltest/stubs/editorGroupService'; import { CapabilitiesTestService } from 'sqltest/stubs/capabilitiesTestService'; import { ConnectionProviderStub } from 'sqltest/stubs/connectionProviderStub'; @@ -32,8 +32,8 @@ import { WorkspaceConfigurationTestService } from 'sqltest/stubs/workspaceConfig import * as assert from 'assert'; import * as TypeMoq from 'typemoq'; -import { IConnectionProfileGroup, ConnectionProfileGroup } from 'sql/parts/connection/common/connectionProfileGroup'; -import { ConnectionProfile } from 'sql/parts/connection/common/connectionProfile'; +import { IConnectionProfileGroup, ConnectionProfileGroup } from 'sql/platform/connection/common/connectionProfileGroup'; +import { ConnectionProfile } from 'sql/platform/connection/common/connectionProfile'; import { AccountManagementTestService } from 'sqltest/stubs/accountManagementStubs'; suite('SQL ConnectionManagementService tests', () => { diff --git a/src/sqltest/parts/connection/connectionProfile.test.ts b/src/sqltest/parts/connection/connectionProfile.test.ts index 585c5c3e35..9f4b8c4d72 100644 --- a/src/sqltest/parts/connection/connectionProfile.test.ts +++ b/src/sqltest/parts/connection/connectionProfile.test.ts @@ -6,8 +6,8 @@ 'use strict'; -import { ConnectionProfile } from 'sql/parts/connection/common/connectionProfile'; -import { IConnectionProfile, IConnectionProfileStore } from 'sql/parts/connection/common/interfaces'; +import { ConnectionProfile } from 'sql/platform/connection/common/connectionProfile'; +import { IConnectionProfile, IConnectionProfileStore } from 'sql/platform/connection/common/interfaces'; import * as sqlops from 'sqlops'; import * as assert from 'assert'; import { ConnectionOptionSpecialType, ServiceOptionType } from 'sql/workbench/api/common/sqlExtHostTypes'; diff --git a/src/sqltest/parts/connection/connectionProfileGroup.test.ts b/src/sqltest/parts/connection/connectionProfileGroup.test.ts index d2926d5f08..0717d4fcda 100644 --- a/src/sqltest/parts/connection/connectionProfileGroup.test.ts +++ b/src/sqltest/parts/connection/connectionProfileGroup.test.ts @@ -6,7 +6,7 @@ 'use strict'; -import { ConnectionProfileGroup } from 'sql/parts/connection/common/connectionProfileGroup'; +import { ConnectionProfileGroup } from 'sql/platform/connection/common/connectionProfileGroup'; import * as assert from 'assert'; suite('SQL ConnectionProfileGroup tests', () => { diff --git a/src/sqltest/parts/connection/connectionStatusManager.test.ts b/src/sqltest/parts/connection/connectionStatusManager.test.ts index 7b2ec680ed..87ca3f110d 100644 --- a/src/sqltest/parts/connection/connectionStatusManager.test.ts +++ b/src/sqltest/parts/connection/connectionStatusManager.test.ts @@ -7,11 +7,11 @@ import * as assert from 'assert'; import * as sqlops from 'sqlops'; -import { ConnectionStatusManager } from 'sql/parts/connection/common/connectionStatusManager'; -import * as Utils from 'sql/parts/connection/common/utils'; -import { IConnectionProfile } from 'sql/parts/connection/common/interfaces'; +import { ConnectionStatusManager } from 'sql/platform/connection/common/connectionStatusManager'; +import * as Utils from 'sql/platform/connection/common/utils'; +import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; import { CapabilitiesTestService } from 'sqltest/stubs/capabilitiesTestService'; -import { ConnectionProfile } from 'sql/parts/connection/common/connectionProfile'; +import { ConnectionProfile } from 'sql/platform/connection/common/connectionProfile'; let connections: ConnectionStatusManager; let capabilitiesService: CapabilitiesTestService; diff --git a/src/sqltest/parts/connection/connectionStore.test.ts b/src/sqltest/parts/connection/connectionStore.test.ts index 2e9a41d0e4..e5afe2a4bc 100644 --- a/src/sqltest/parts/connection/connectionStore.test.ts +++ b/src/sqltest/parts/connection/connectionStore.test.ts @@ -5,20 +5,20 @@ 'use strict'; import * as TypeMoq from 'typemoq'; -import { ConnectionConfig } from 'sql/parts/connection/common/connectionConfig'; -import { IConnectionProfile } from 'sql/parts/connection/common/interfaces'; +import { ConnectionConfig } from 'sql/platform/connection/common/connectionConfig'; +import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; import { WorkspaceConfigurationTestService } from 'sqltest/stubs/workspaceConfigurationTestService'; -import * as Constants from 'sql/parts/connection/common/constants'; +import * as Constants from 'sql/platform/connection/common/constants'; import { StorageTestService } from 'sqltest/stubs/storageTestService'; -import { ConnectionStore } from 'sql/parts/connection/common/connectionStore'; -import { CredentialsService } from 'sql/services/credentials/credentialsService'; +import { ConnectionStore } from 'sql/platform/connection/common/connectionStore'; +import { CredentialsService } from 'sql/platform/credentials/common/credentialsService'; import * as assert from 'assert'; import { Memento } from 'vs/workbench/common/memento'; -import { CapabilitiesService } from 'sql/services/capabilities/capabilitiesService'; +import { CapabilitiesService } from 'sql/platform/capabilities/common/capabilitiesService'; import * as sqlops from 'sqlops'; -import { ConnectionProfile } from 'sql/parts/connection/common/connectionProfile'; +import { ConnectionProfile } from 'sql/platform/connection/common/connectionProfile'; import { Emitter } from 'vs/base/common/event'; -import { ConnectionProfileGroup, IConnectionProfileGroup } from 'sql/parts/connection/common/connectionProfileGroup'; +import { ConnectionProfileGroup, IConnectionProfileGroup } from 'sql/platform/connection/common/connectionProfileGroup'; import { ConnectionOptionSpecialType, ServiceOptionType } from 'sql/workbench/api/common/sqlExtHostTypes'; import { CapabilitiesTestService } from '../../stubs/capabilitiesTestService'; import { ConnectionProviderProperties } from 'sql/workbench/parts/connection/common/connectionProviderExtension'; diff --git a/src/sqltest/parts/connection/connectionTreeActions.test.ts b/src/sqltest/parts/connection/connectionTreeActions.test.ts index e4e47bc96a..202b9dfb66 100644 --- a/src/sqltest/parts/connection/connectionTreeActions.test.ts +++ b/src/sqltest/parts/connection/connectionTreeActions.test.ts @@ -8,8 +8,8 @@ import { TPromise } from 'vs/base/common/winjs.base'; import * as TypeMoq from 'typemoq'; import * as assert from 'assert'; -import { ConnectionProfileGroup } from 'sql/parts/connection/common/connectionProfileGroup'; -import { ConnectionProfile } from 'sql/parts/connection/common/connectionProfile'; +import { ConnectionProfileGroup } from 'sql/platform/connection/common/connectionProfileGroup'; +import { ConnectionProfile } from 'sql/platform/connection/common/connectionProfile'; import { RefreshAction, AddServerAction, DeleteConnectionAction, DisconnectConnectionAction, ActiveConnectionsFilterAction, RecentConnectionsFilterAction @@ -19,7 +19,7 @@ import { TestConnectionManagementService } from 'sqltest/stubs/connectionManagem import { ErrorMessageServiceStub } from 'sqltest/stubs/errorMessageServiceStub'; import { InstantiationService } from 'vs/platform/instantiation/common/instantiationService'; import { ServerTreeView } from 'sql/parts/objectExplorer/viewlet/serverTreeView'; -import * as Constants from 'sql/parts/connection/common/constants'; +import * as Constants from 'sql/platform/connection/common/constants'; import * as LocalizedConstants from 'sql/parts/connection/common/localizedConstants'; import { ObjectExplorerService, ObjectExplorerNodeEventArgs } from 'sql/parts/objectExplorer/common/objectExplorerService'; import { TreeNode } from 'sql/parts/objectExplorer/common/treeNode'; @@ -31,7 +31,7 @@ import WinJS = require('vs/base/common/winjs.base'); import { Emitter } from 'vs/base/common/event'; import Severity from 'vs/base/common/severity'; import { ObjectExplorerActionsContext, ManageConnectionAction } from 'sql/parts/objectExplorer/viewlet/objectExplorerActions'; -import { IConnectionResult, IConnectionParams } from 'sql/parts/connection/common/connectionManagement'; +import { IConnectionResult, IConnectionParams } from 'sql/platform/connection/common/connectionManagement'; import { TreeSelectionHandler } from 'sql/parts/objectExplorer/viewlet/treeSelectionHandler'; import { CapabilitiesTestService } from 'sqltest/stubs/capabilitiesTestService'; diff --git a/src/sqltest/parts/connection/objectExplorerService.test.ts b/src/sqltest/parts/connection/objectExplorerService.test.ts index 67cc030fb5..a58fe43eb5 100644 --- a/src/sqltest/parts/connection/objectExplorerService.test.ts +++ b/src/sqltest/parts/connection/objectExplorerService.test.ts @@ -6,8 +6,8 @@ 'use strict'; import { ObjectExplorerProviderTestService } from 'sqltest/stubs/objectExplorerProviderTestService'; import { TestConnectionManagementService } from 'sqltest/stubs/connectionManagementService.test'; -import { ConnectionProfile } from 'sql/parts/connection/common/connectionProfile'; -import { ConnectionProfileGroup } from 'sql/parts/connection/common/connectionProfileGroup'; +import { ConnectionProfile } from 'sql/platform/connection/common/connectionProfile'; +import { ConnectionProfileGroup } from 'sql/platform/connection/common/connectionProfileGroup'; import { ObjectExplorerService } from 'sql/parts/objectExplorer/common/objectExplorerService'; import { NodeType } from 'sql/parts/objectExplorer/common/nodeType'; import { TreeNode, TreeItemCollapsibleState, ObjectExplorerCallbacks } from 'sql/parts/objectExplorer/common/treeNode'; @@ -19,7 +19,7 @@ import * as assert from 'assert'; import { ServerTreeView } from 'sql/parts/objectExplorer/viewlet/serverTreeView'; import { ConnectionOptionSpecialType, ServiceOptionType } from 'sql/workbench/api/common/sqlExtHostTypes'; import { Event, Emitter } from 'vs/base/common/event'; -import { CapabilitiesService } from 'sql/services/capabilities/capabilitiesService'; +import { CapabilitiesService } from 'sql/platform/capabilities/common/capabilitiesService'; import { CapabilitiesTestService } from 'sqltest/stubs/capabilitiesTestService'; suite('SQL Object Explorer Service tests', () => { diff --git a/src/sqltest/parts/connection/providerConnectionInfo.test.ts b/src/sqltest/parts/connection/providerConnectionInfo.test.ts index c6b759c319..04afe0437c 100644 --- a/src/sqltest/parts/connection/providerConnectionInfo.test.ts +++ b/src/sqltest/parts/connection/providerConnectionInfo.test.ts @@ -6,12 +6,12 @@ 'use strict'; -import { ProviderConnectionInfo } from 'sql/parts/connection/common/providerConnectionInfo'; -import { IConnectionProfile } from 'sql/parts/connection/common/interfaces'; +import { ProviderConnectionInfo } from 'sql/platform/connection/common/providerConnectionInfo'; +import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; import * as sqlops from 'sqlops'; import * as assert from 'assert'; import { ConnectionOptionSpecialType, ServiceOptionType } from 'sql/workbench/api/common/sqlExtHostTypes'; -import { ICapabilitiesService } from 'sql/services/capabilities/capabilitiesService'; +import { ICapabilitiesService } from 'sql/platform/capabilities/common/capabilitiesService'; import { CapabilitiesTestService } from 'sqltest/stubs/capabilitiesTestService'; suite('SQL ProviderConnectionInfo tests', () => { diff --git a/src/sqltest/parts/dashboard/widgets/explorerWidget.component.test.ts b/src/sqltest/parts/dashboard/widgets/explorerWidget.component.test.ts index c57e96be0e..b5fd9a95d4 100644 --- a/src/sqltest/parts/dashboard/widgets/explorerWidget.component.test.ts +++ b/src/sqltest/parts/dashboard/widgets/explorerWidget.component.test.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import { ObjectMetadataWrapper } from 'sql/parts/dashboard/widgets/explorer/explorerTree'; -import { MetadataType } from 'sql/parts/connection/common/connectionManagement'; +import { MetadataType } from 'sql/platform/connection/common/connectionManagement'; import * as assert from 'assert'; diff --git a/src/sqltest/parts/dashboard/widgets/propertiesWidget.component.test.ts b/src/sqltest/parts/dashboard/widgets/propertiesWidget.component.test.ts index 559b30ec29..75ea600a32 100644 --- a/src/sqltest/parts/dashboard/widgets/propertiesWidget.component.test.ts +++ b/src/sqltest/parts/dashboard/widgets/propertiesWidget.component.test.ts @@ -11,7 +11,7 @@ import { WidgetConfig } from 'sql/parts/dashboard/common/dashboardWidget'; import { DashboardServiceInterface } from 'sql/parts/dashboard/services/dashboardServiceInterface.service'; import { SingleAdminService, SingleConnectionManagementService } from 'sql/services/common/commonServiceInterface.service'; import { PropertiesWidgetComponent } from 'sql/parts/dashboard/widgets/properties/propertiesWidget.component'; -import { ConnectionManagementInfo } from 'sql/parts/connection/common/connectionManagementInfo'; +import { ConnectionManagementInfo } from 'sql/platform/connection/common/connectionManagementInfo'; import * as TypeMoq from 'typemoq'; import * as assert from 'assert'; diff --git a/src/sqltest/parts/insights/insightsDialogController.test.ts b/src/sqltest/parts/insights/insightsDialogController.test.ts index 3e36c56a76..74e7825772 100644 --- a/src/sqltest/parts/insights/insightsDialogController.test.ts +++ b/src/sqltest/parts/insights/insightsDialogController.test.ts @@ -5,10 +5,10 @@ import { InsightsDialogController } from 'sql/parts/insights/node/insightsDialogController'; import { InsightsDialogModel } from 'sql/parts/insights/common/insightsDialogModel'; -import QueryRunner, { EventType } from 'sql/parts/query/execution/queryRunner'; -import { ConnectionManagementService } from 'sql/parts/connection/common/connectionManagementService'; +import QueryRunner, { EventType } from 'sql/platform/query/common/queryRunner'; +import { ConnectionManagementService } from 'sql/platform/connection/common/connectionManagementService'; import { IInsightsConfigDetails } from 'sql/parts/dashboard/widgets/insights/interfaces'; -import { IConnectionProfile } from 'sql/parts/connection/common/interfaces'; +import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; import { InstantiationService } from 'vs/platform/instantiation/common/instantiationService'; diff --git a/src/sqltest/parts/jobManagement/jobManagementService.test.ts b/src/sqltest/parts/jobManagement/jobManagementService.test.ts index 24c2bfdfb5..94db230682 100644 --- a/src/sqltest/parts/jobManagement/jobManagementService.test.ts +++ b/src/sqltest/parts/jobManagement/jobManagementService.test.ts @@ -4,10 +4,7 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; -import * as sqlops from 'sqlops'; -import * as assert from 'assert'; -import * as TypeMoq from 'typemoq'; -import { JobManagementService } from 'sql/parts/jobManagement/common/jobManagementService'; +import { JobManagementService } from 'sql/platform/jobManagement/common/jobManagementService'; // TESTS /////////////////////////////////////////////////////////////////// suite('Job Management service tests', () => { diff --git a/src/sqltest/parts/modelComponents/componentBase.test.ts b/src/sqltest/parts/modelComponents/componentBase.test.ts index 41095483b1..5c419f9abe 100644 --- a/src/sqltest/parts/modelComponents/componentBase.test.ts +++ b/src/sqltest/parts/modelComponents/componentBase.test.ts @@ -3,14 +3,14 @@ * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ +'use strict'; + import * as assert from 'assert'; -import { Mock, It, Times, MockBehavior } from 'typemoq'; import { ComponentBase, ContainerBase, ItemDescriptor } from 'sql/parts/modelComponents/componentBase'; import { IComponentDescriptor, IModelStore, ComponentEventType } from 'sql/parts/modelComponents/interfaces'; import { ModelStore } from 'sql/parts/modelComponents/modelStore'; import { ChangeDetectorRef } from '@angular/core'; -'use strict'; class TestComponent extends ComponentBase { public descriptor: IComponentDescriptor; diff --git a/src/sqltest/parts/modelComponents/table.component.test.ts b/src/sqltest/parts/modelComponents/table.component.test.ts index e211f2c46a..e1508e0294 100644 --- a/src/sqltest/parts/modelComponents/table.component.test.ts +++ b/src/sqltest/parts/modelComponents/table.component.test.ts @@ -3,11 +3,10 @@ * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import * as assert from 'assert'; -import TableComponent from 'sql/parts/modelComponents/table.component'; - 'use strict'; +import * as assert from 'assert'; +import TableComponent from 'sql/parts/modelComponents/table.component'; suite('TableComponent Tests', () => { diff --git a/src/sqltest/parts/notebook/common.ts b/src/sqltest/parts/notebook/common.ts index 4069b85706..3afa623ea1 100644 --- a/src/sqltest/parts/notebook/common.ts +++ b/src/sqltest/parts/notebook/common.ts @@ -10,96 +10,96 @@ import { nb, IConnectionProfile } from 'sqlops'; import { Event, Emitter } from 'vs/base/common/event'; import { INotebookModel, ICellModel, IClientSession, IDefaultConnection, NotebookContentChange } from 'sql/parts/notebook/models/modelInterfaces'; import { NotebookChangeType, CellType } from 'sql/parts/notebook/models/contracts'; -import { INotebookManager } from 'sql/services/notebook/notebookService'; +import { INotebookManager } from 'sql/workbench/services/notebook/common/notebookService'; import { ISingleNotebookEditOperation } from 'sql/workbench/api/common/sqlExtHostTypes'; export class NotebookModelStub implements INotebookModel { - constructor(private _languageInfo?: nb.ILanguageInfo) { - } - public trustedMode: boolean; + constructor(private _languageInfo?: nb.ILanguageInfo) { + } + public trustedMode: boolean; - public get languageInfo(): nb.ILanguageInfo { - return this._languageInfo; - } - onCellChange(cell: ICellModel, change: NotebookChangeType): void { - // Default: do nothing - } - get cells(): ReadonlyArray { - throw new Error('method not implemented.'); - } - get clientSession(): IClientSession { - throw new Error('method not implemented.'); - } - get notebookManagers(): INotebookManager[] { - throw new Error('method not implemented.'); - } - get kernelChanged(): Event { - throw new Error('method not implemented.'); - } - get kernelsChanged(): Event { - throw new Error('method not implemented.'); - } get defaultKernel(): nb.IKernelSpec { - throw new Error('method not implemented.'); - } - get contextsChanged(): Event { - throw new Error('method not implemented.'); - } - get contentChanged(): Event { + public get languageInfo(): nb.ILanguageInfo { + return this._languageInfo; + } + onCellChange(cell: ICellModel, change: NotebookChangeType): void { + // Default: do nothing + } + get cells(): ReadonlyArray { throw new Error('method not implemented.'); } - get specs(): nb.IAllKernels { - throw new Error('method not implemented.'); - } - get contexts(): IDefaultConnection { - throw new Error('method not implemented.'); - } - get providerId(): string { - throw new Error('method not implemented.'); - } - changeKernel(displayName: string): void { - throw new Error('Method not implemented.'); - } - changeContext(host: string, connection?: IConnectionProfile): void { - throw new Error('Method not implemented.'); - } - findCellIndex(cellModel: ICellModel): number { - throw new Error('Method not implemented.'); - } - addCell(cellType: CellType, index?: number): void { - throw new Error('Method not implemented.'); - } - deleteCell(cellModel: ICellModel): void { - throw new Error('Method not implemented.'); - } - saveModel(): Promise { - throw new Error('Method not implemented.'); - } - pushEditOperations(edits: ISingleNotebookEditOperation[]): void { - throw new Error('Method not implemented.'); - } + get clientSession(): IClientSession { + throw new Error('method not implemented.'); + } + get notebookManagers(): INotebookManager[] { + throw new Error('method not implemented.'); + } + get kernelChanged(): Event { + throw new Error('method not implemented.'); + } + get kernelsChanged(): Event { + throw new Error('method not implemented.'); + } get defaultKernel(): nb.IKernelSpec { + throw new Error('method not implemented.'); + } + get contextsChanged(): Event { + throw new Error('method not implemented.'); + } + get contentChanged(): Event { + throw new Error('method not implemented.'); + } + get specs(): nb.IAllKernels { + throw new Error('method not implemented.'); + } + get contexts(): IDefaultConnection { + throw new Error('method not implemented.'); + } + get providerId(): string { + throw new Error('method not implemented.'); + } + changeKernel(displayName: string): void { + throw new Error('Method not implemented.'); + } + changeContext(host: string, connection?: IConnectionProfile): void { + throw new Error('Method not implemented.'); + } + findCellIndex(cellModel: ICellModel): number { + throw new Error('Method not implemented.'); + } + addCell(cellType: CellType, index?: number): void { + throw new Error('Method not implemented.'); + } + deleteCell(cellModel: ICellModel): void { + throw new Error('Method not implemented.'); + } + saveModel(): Promise { + throw new Error('Method not implemented.'); + } + pushEditOperations(edits: ISingleNotebookEditOperation[]): void { + throw new Error('Method not implemented.'); + } } export class NotebookManagerStub implements INotebookManager { - providerId: string; - contentManager: nb.ContentManager; - sessionManager: nb.SessionManager; - serverManager: nb.ServerManager; + providerId: string; + contentManager: nb.ContentManager; + sessionManager: nb.SessionManager; + serverManager: nb.ServerManager; } export class ServerManagerStub implements nb.ServerManager { - public onServerStartedEmitter = new Emitter(); - onServerStarted: Event = this.onServerStartedEmitter.event; - isStarted: boolean = false; - calledStart: boolean = false; - calledEnd: boolean = false; - public result: Promise = undefined; + public onServerStartedEmitter = new Emitter(); + onServerStarted: Event = this.onServerStartedEmitter.event; + isStarted: boolean = false; + calledStart: boolean = false; + calledEnd: boolean = false; + public result: Promise = undefined; - startServer(): Promise { - this.calledStart = true; - return this.result; - } - stopServer(): Promise { - this.calledEnd = true; - return this.result; - } + startServer(): Promise { + this.calledStart = true; + return this.result; + } + stopServer(): Promise { + this.calledEnd = true; + return this.result; + } } \ No newline at end of file diff --git a/src/sqltest/parts/notebook/model/cell.test.ts b/src/sqltest/parts/notebook/model/cell.test.ts index 2d602faa35..3da6f796b3 100644 --- a/src/sqltest/parts/notebook/model/cell.test.ts +++ b/src/sqltest/parts/notebook/model/cell.test.ts @@ -14,265 +14,265 @@ import * as objects from 'vs/base/common/objects'; import { CellTypes } from 'sql/parts/notebook/models/contracts'; import { ModelFactory } from 'sql/parts/notebook/models/modelFactory'; import { NotebookModelStub } from '../common'; -import { EmptyFuture } from 'sql/services/notebook/sessionManager'; +import { EmptyFuture } from 'sql/workbench/services/notebook/common/sessionManager'; import { ICellModel } from 'sql/parts/notebook/models/modelInterfaces'; describe('Cell Model', function (): void { - let factory = new ModelFactory(); - it('Should set default values if none defined', async function (): Promise { - let cell = factory.createCell(undefined, undefined); - should(cell.cellType).equal(CellTypes.Code); - should(cell.source).equal(''); - }); + let factory = new ModelFactory(); + it('Should set default values if none defined', async function (): Promise { + let cell = factory.createCell(undefined, undefined); + should(cell.cellType).equal(CellTypes.Code); + should(cell.source).equal(''); + }); - it('Should update values', async function (): Promise { - let cell = factory.createCell(undefined, undefined); - cell.language = 'sql'; - should(cell.language).equal('sql'); - cell.source = 'abcd'; - should(cell.source).equal('abcd'); - }); + it('Should update values', async function (): Promise { + let cell = factory.createCell(undefined, undefined); + cell.language = 'sql'; + should(cell.language).equal('sql'); + cell.source = 'abcd'; + should(cell.source).equal('abcd'); + }); - it('Should match ICell values if defined', async function (): Promise { - let output: nb.IStreamResult = { - output_type: 'stream', - text: 'Some output', - name: 'stdout' - }; - let cellData: nb.ICellContents = { - cell_type: CellTypes.Markdown, - source: 'some *markdown*', - outputs: [output], - metadata: { language: 'python'}, - execution_count: 1 - }; - let cell = factory.createCell(cellData, undefined); - should(cell.cellType).equal(cellData.cell_type); - should(cell.source).equal(cellData.source); - should(cell.outputs).have.length(1); - should(cell.outputs[0].output_type).equal('stream'); - should((cell.outputs[0]).text).equal('Some output'); - }); + it('Should match ICell values if defined', async function (): Promise { + let output: nb.IStreamResult = { + output_type: 'stream', + text: 'Some output', + name: 'stdout' + }; + let cellData: nb.ICellContents = { + cell_type: CellTypes.Markdown, + source: 'some *markdown*', + outputs: [output], + metadata: { language: 'python' }, + execution_count: 1 + }; + let cell = factory.createCell(cellData, undefined); + should(cell.cellType).equal(cellData.cell_type); + should(cell.source).equal(cellData.source); + should(cell.outputs).have.length(1); + should(cell.outputs[0].output_type).equal('stream'); + should((cell.outputs[0]).text).equal('Some output'); + }); - it('Should set cell language to python if defined as python in languageInfo', async function (): Promise { - let cellData: nb.ICellContents = { - cell_type: CellTypes.Code, - source: 'print(\'1\')', - metadata: { language: 'python'}, - execution_count: 1 - }; + it('Should set cell language to python if defined as python in languageInfo', async function (): Promise { + let cellData: nb.ICellContents = { + cell_type: CellTypes.Code, + source: 'print(\'1\')', + metadata: { language: 'python' }, + execution_count: 1 + }; - let notebookModel = new NotebookModelStub({ - name: 'python', - version: '', - mimetype: '' - }); - let cell = factory.createCell(cellData, { notebook: notebookModel, isTrusted: false }); - should(cell.language).equal('python'); - }); + let notebookModel = new NotebookModelStub({ + name: 'python', + version: '', + mimetype: '' + }); + let cell = factory.createCell(cellData, { notebook: notebookModel, isTrusted: false }); + should(cell.language).equal('python'); + }); - it('Should set cell language to python if defined as pyspark in languageInfo', async function (): Promise { - let cellData: nb.ICellContents = { - cell_type: CellTypes.Code, - source: 'print(\'1\')', - metadata: { language: 'python'}, - execution_count: 1 - }; + it('Should set cell language to python if defined as pyspark in languageInfo', async function (): Promise { + let cellData: nb.ICellContents = { + cell_type: CellTypes.Code, + source: 'print(\'1\')', + metadata: { language: 'python' }, + execution_count: 1 + }; - let notebookModel = new NotebookModelStub({ - name: 'pyspark', - version: '', - mimetype: '' - }); - let cell = factory.createCell(cellData, { notebook: notebookModel, isTrusted: false }); - should(cell.language).equal('python'); - }); + let notebookModel = new NotebookModelStub({ + name: 'pyspark', + version: '', + mimetype: '' + }); + let cell = factory.createCell(cellData, { notebook: notebookModel, isTrusted: false }); + should(cell.language).equal('python'); + }); - it('Should set cell language to scala if defined as scala in languageInfo', async function (): Promise { - let cellData: nb.ICellContents = { - cell_type: CellTypes.Code, - source: 'print(\'1\')', - metadata: { }, - execution_count: 1 - }; + it('Should set cell language to scala if defined as scala in languageInfo', async function (): Promise { + let cellData: nb.ICellContents = { + cell_type: CellTypes.Code, + source: 'print(\'1\')', + metadata: {}, + execution_count: 1 + }; - let notebookModel = new NotebookModelStub({ - name: 'scala', - version: '', - mimetype: '' - }); - let cell = factory.createCell(cellData, { notebook: notebookModel, isTrusted: false }); - should(cell.language).equal('scala'); - }); - it('Should keep cell language as python if cell has language override', async function (): Promise { - let cellData: nb.ICellContents = { - cell_type: CellTypes.Code, - source: 'print(\'1\')', - metadata: { language: 'python'}, - execution_count: 1 - }; + let notebookModel = new NotebookModelStub({ + name: 'scala', + version: '', + mimetype: '' + }); + let cell = factory.createCell(cellData, { notebook: notebookModel, isTrusted: false }); + should(cell.language).equal('scala'); + }); + it('Should keep cell language as python if cell has language override', async function (): Promise { + let cellData: nb.ICellContents = { + cell_type: CellTypes.Code, + source: 'print(\'1\')', + metadata: { language: 'python' }, + execution_count: 1 + }; - let notebookModel = new NotebookModelStub({ - name: 'scala', - version: '', - mimetype: '' - }); - let cell = factory.createCell(cellData, { notebook: notebookModel, isTrusted: false }); - should(cell.language).equal('python'); - }); + let notebookModel = new NotebookModelStub({ + name: 'scala', + version: '', + mimetype: '' + }); + let cell = factory.createCell(cellData, { notebook: notebookModel, isTrusted: false }); + should(cell.language).equal('python'); + }); - it('Should set cell language to python if no language defined', async function (): Promise { - let cellData: nb.ICellContents = { - cell_type: CellTypes.Code, - source: 'print(\'1\')', - metadata: { language: 'python'}, - execution_count: 1 - }; + it('Should set cell language to python if no language defined', async function (): Promise { + let cellData: nb.ICellContents = { + cell_type: CellTypes.Code, + source: 'print(\'1\')', + metadata: { language: 'python' }, + execution_count: 1 + }; - let notebookModel = new NotebookModelStub({ - name: '', - version: '', - mimetype: '' - }); - let cell = factory.createCell(cellData, { notebook: notebookModel, isTrusted: false }); - should(cell.language).equal('python'); - }); + let notebookModel = new NotebookModelStub({ + name: '', + version: '', + mimetype: '' + }); + let cell = factory.createCell(cellData, { notebook: notebookModel, isTrusted: false }); + should(cell.language).equal('python'); + }); - it('Should match cell language to language specified if unknown language defined in languageInfo', async function (): Promise { - let cellData: nb.ICellContents = { - cell_type: CellTypes.Code, - source: 'std::cout << "hello world";', - metadata: { }, - execution_count: 1 - }; + it('Should match cell language to language specified if unknown language defined in languageInfo', async function (): Promise { + let cellData: nb.ICellContents = { + cell_type: CellTypes.Code, + source: 'std::cout << "hello world";', + metadata: {}, + execution_count: 1 + }; - let notebookModel = new NotebookModelStub({ - name: 'cplusplus', - version: '', - mimetype: '' - }); - let cell = factory.createCell(cellData, { notebook: notebookModel, isTrusted: false }); - should(cell.language).equal('cplusplus'); - }); + let notebookModel = new NotebookModelStub({ + name: 'cplusplus', + version: '', + mimetype: '' + }); + let cell = factory.createCell(cellData, { notebook: notebookModel, isTrusted: false }); + should(cell.language).equal('cplusplus'); + }); - it('Should match cell language to mimetype name is not supplied in languageInfo', async function (): Promise { - let cellData: nb.ICellContents = { - cell_type: CellTypes.Code, - source: 'print(\'1\')', - metadata: { }, - execution_count: 1 - }; + it('Should match cell language to mimetype name is not supplied in languageInfo', async function (): Promise { + let cellData: nb.ICellContents = { + cell_type: CellTypes.Code, + source: 'print(\'1\')', + metadata: {}, + execution_count: 1 + }; - let notebookModel = new NotebookModelStub({ - name: '', - version: '', - mimetype: 'x-scala' - }); - let cell = factory.createCell(cellData, { notebook: notebookModel, isTrusted: false }); - should(cell.language).equal('scala'); - }); + let notebookModel = new NotebookModelStub({ + name: '', + version: '', + mimetype: 'x-scala' + }); + let cell = factory.createCell(cellData, { notebook: notebookModel, isTrusted: false }); + should(cell.language).equal('scala'); + }); - describe('Model Future handling', function(): void { - let future: TypeMoq.Mock; - let cell: ICellModel; - beforeEach(() => { - future = TypeMoq.Mock.ofType(EmptyFuture); - cell = factory.createCell({ - cell_type: CellTypes.Code, - source: 'print "Hello"', - metadata: { language: 'python'}, - execution_count: 1 - }, { - notebook: new NotebookModelStub({ - name: '', - version: '', - mimetype: 'x-scala' - }), - isTrusted: false - }); - }); + describe('Model Future handling', function (): void { + let future: TypeMoq.Mock; + let cell: ICellModel; + beforeEach(() => { + future = TypeMoq.Mock.ofType(EmptyFuture); + cell = factory.createCell({ + cell_type: CellTypes.Code, + source: 'print "Hello"', + metadata: { language: 'python' }, + execution_count: 1 + }, { + notebook: new NotebookModelStub({ + name: '', + version: '', + mimetype: 'x-scala' + }), + isTrusted: false + }); + }); - it('should send and handle incoming messages', async () => { - // Given a future - let onReply: nb.MessageHandler; - let onIopub: nb.MessageHandler; - future.setup(f => f.setReplyHandler(TypeMoq.It.isAny())).callback((handler) => onReply = handler); - future.setup(f => f.setIOPubHandler(TypeMoq.It.isAny())).callback((handler) => onIopub = handler); - let outputs: ReadonlyArray = undefined; - cell.onOutputsChanged((o => outputs = o)); + it('should send and handle incoming messages', async () => { + // Given a future + let onReply: nb.MessageHandler; + let onIopub: nb.MessageHandler; + future.setup(f => f.setReplyHandler(TypeMoq.It.isAny())).callback((handler) => onReply = handler); + future.setup(f => f.setIOPubHandler(TypeMoq.It.isAny())).callback((handler) => onIopub = handler); + let outputs: ReadonlyArray = undefined; + cell.onOutputsChanged((o => outputs = o)); - // When I set it on the cell - cell.setFuture(future.object); + // When I set it on the cell + cell.setFuture(future.object); - // Then I expect outputs to have been cleared - should(outputs).have.length(0); - should(onReply).not.be.undefined(); - // ... And when I send an IoPub message - let message: nb.IIOPubMessage = { - channel: 'iopub', - type: 'iopub', - parent_header: undefined, - metadata: undefined, - header: { - msg_type: 'stream' - }, - content: { - text: 'Printed hello world' - } - }; - onIopub.handle(message); - // Then I expect an output to be added - should(outputs).have.length(1); - should(outputs[0].output_type).equal('stream'); + // Then I expect outputs to have been cleared + should(outputs).have.length(0); + should(onReply).not.be.undefined(); + // ... And when I send an IoPub message + let message: nb.IIOPubMessage = { + channel: 'iopub', + type: 'iopub', + parent_header: undefined, + metadata: undefined, + header: { + msg_type: 'stream' + }, + content: { + text: 'Printed hello world' + } + }; + onIopub.handle(message); + // Then I expect an output to be added + should(outputs).have.length(1); + should(outputs[0].output_type).equal('stream'); - message = objects.deepClone(message); - message.header.msg_type = 'display_data'; - onIopub.handle(message); - should(outputs[1].output_type).equal('display_data'); + message = objects.deepClone(message); + message.header.msg_type = 'display_data'; + onIopub.handle(message); + should(outputs[1].output_type).equal('display_data'); - // ... TODO: And when I sent a reply I expect it to be processed. - }); + // ... TODO: And when I sent a reply I expect it to be processed. + }); - it('should delete transient tag while handling incoming messages', async () => { - // Given a future - let onIopub: nb.MessageHandler; - future.setup(f => f.setIOPubHandler(TypeMoq.It.isAny())).callback((handler) => onIopub = handler); - let outputs: ReadonlyArray = undefined; - cell.onOutputsChanged((o => outputs = o)); + it('should delete transient tag while handling incoming messages', async () => { + // Given a future + let onIopub: nb.MessageHandler; + future.setup(f => f.setIOPubHandler(TypeMoq.It.isAny())).callback((handler) => onIopub = handler); + let outputs: ReadonlyArray = undefined; + cell.onOutputsChanged((o => outputs = o)); - //Set the future - cell.setFuture(future.object); + //Set the future + cell.setFuture(future.object); - // ... And when I send an IoPub message - let message: nb.IIOPubMessage = { - channel: 'iopub', - type: 'iopub', - parent_header: undefined, - metadata: undefined, - header: { - msg_type: 'display_data' - }, - content: { - text: 'Printed hello world', - transient: 'transient data' - } - }; - onIopub.handle(message); - //Output array's length should be 1 - //'transient' tag should no longer exist in the output - should(outputs).have.length(1); - should(outputs[0]['transient']).be.undefined(); - }); + // ... And when I send an IoPub message + let message: nb.IIOPubMessage = { + channel: 'iopub', + type: 'iopub', + parent_header: undefined, + metadata: undefined, + header: { + msg_type: 'display_data' + }, + content: { + text: 'Printed hello world', + transient: 'transient data' + } + }; + onIopub.handle(message); + //Output array's length should be 1 + //'transient' tag should no longer exist in the output + should(outputs).have.length(1); + should(outputs[0]['transient']).be.undefined(); + }); - it('should dispose old future', async () => { - let oldFuture = TypeMoq.Mock.ofType(EmptyFuture); - cell.setFuture(oldFuture.object); + it('should dispose old future', async () => { + let oldFuture = TypeMoq.Mock.ofType(EmptyFuture); + cell.setFuture(oldFuture.object); - cell.setFuture(future.object); + cell.setFuture(future.object); - oldFuture.verify(f => f.dispose(), TypeMoq.Times.once()); - }); - }); + oldFuture.verify(f => f.dispose(), TypeMoq.Times.once()); + }); + }); }); diff --git a/src/sqltest/parts/notebook/model/clientSession.test.ts b/src/sqltest/parts/notebook/model/clientSession.test.ts index 54668f4c94..fd762e5d77 100644 --- a/src/sqltest/parts/notebook/model/clientSession.test.ts +++ b/src/sqltest/parts/notebook/model/clientSession.test.ts @@ -15,188 +15,188 @@ import { TestNotificationService } from 'vs/platform/notification/test/common/te import URI from 'vs/base/common/uri'; import { ClientSession } from 'sql/parts/notebook/models/clientSession'; -import { SessionManager, EmptySession } from 'sql/services/notebook/sessionManager'; +import { SessionManager, EmptySession } from 'sql/workbench/services/notebook/common/sessionManager'; import { NotebookManagerStub, ServerManagerStub } from 'sqltest/parts/notebook/common'; -describe('Client Session', function(): void { - let path = URI.file('my/notebook.ipynb'); - let notebookManager: NotebookManagerStub; - let serverManager: ServerManagerStub; - let mockSessionManager: TypeMoq.Mock; - let notificationService: TypeMoq.Mock; - let session: ClientSession; - let remoteSession: ClientSession; +describe('Client Session', function (): void { + let path = URI.file('my/notebook.ipynb'); + let notebookManager: NotebookManagerStub; + let serverManager: ServerManagerStub; + let mockSessionManager: TypeMoq.Mock; + let notificationService: TypeMoq.Mock; + let session: ClientSession; + let remoteSession: ClientSession; - beforeEach(() => { - serverManager = new ServerManagerStub(); - mockSessionManager = TypeMoq.Mock.ofType(SessionManager); - notebookManager = new NotebookManagerStub(); - notebookManager.serverManager = serverManager; - notebookManager.sessionManager = mockSessionManager.object; + beforeEach(() => { + serverManager = new ServerManagerStub(); + mockSessionManager = TypeMoq.Mock.ofType(SessionManager); + notebookManager = new NotebookManagerStub(); + notebookManager.serverManager = serverManager; + notebookManager.sessionManager = mockSessionManager.object; notificationService = TypeMoq.Mock.ofType(TestNotificationService, TypeMoq.MockBehavior.Loose); - session = new ClientSession({ - notebookManager: notebookManager, - notebookUri: path, - notificationService: notificationService.object - }); + session = new ClientSession({ + notebookManager: notebookManager, + notebookUri: path, + notificationService: notificationService.object + }); - let serverlessNotebookManager = new NotebookManagerStub(); - serverlessNotebookManager.sessionManager = mockSessionManager.object; - remoteSession = new ClientSession({ - notebookManager: serverlessNotebookManager, - notebookUri: path, - notificationService: notificationService.object - }); - }); + let serverlessNotebookManager = new NotebookManagerStub(); + serverlessNotebookManager.sessionManager = mockSessionManager.object; + remoteSession = new ClientSession({ + notebookManager: serverlessNotebookManager, + notebookUri: path, + notificationService: notificationService.object + }); + }); - it('Should set path, isReady and ready on construction', function(): void { - should(session.notebookUri).equal(path); - should(session.ready).not.be.undefined(); - should(session.isReady).be.false(); - should(session.status).equal('starting'); - should(session.isInErrorState).be.false(); - should(session.errorMessage).be.undefined(); - }); + it('Should set path, isReady and ready on construction', function (): void { + should(session.notebookUri).equal(path); + should(session.ready).not.be.undefined(); + should(session.isReady).be.false(); + should(session.status).equal('starting'); + should(session.isInErrorState).be.false(); + should(session.errorMessage).be.undefined(); + }); - it('Should call on serverManager startup if set', async function(): Promise { - // Given I have a serverManager that starts successfully - serverManager.result = Promise.resolve(); - should(session.isReady).be.false(); + it('Should call on serverManager startup if set', async function (): Promise { + // Given I have a serverManager that starts successfully + serverManager.result = Promise.resolve(); + should(session.isReady).be.false(); - // When I kick off initialization - await session.initialize(); + // When I kick off initialization + await session.initialize(); - // Then I expect ready to be completed too - await session.ready; - should(serverManager.calledStart).be.true(); - should(session.isReady).be.true(); - }); + // Then I expect ready to be completed too + await session.ready; + should(serverManager.calledStart).be.true(); + should(session.isReady).be.true(); + }); - it('Should go to error state if serverManager startup fails', async function(): Promise { - // Given I have a serverManager that fails to start - serverManager.result = Promise.reject('error'); - should(session.isInErrorState).be.false(); + it('Should go to error state if serverManager startup fails', async function (): Promise { + // Given I have a serverManager that fails to start + serverManager.result = Promise.reject('error'); + should(session.isInErrorState).be.false(); - // When I initialize - await session.initialize(); + // When I initialize + await session.initialize(); - // Then I expect ready to complete, but isInErrorState to be true - await session.ready; - should(session.isReady).be.true(); - should(serverManager.calledStart).be.true(); - should(session.isInErrorState).be.true(); - should(session.errorMessage).equal('error'); - }); + // Then I expect ready to complete, but isInErrorState to be true + await session.ready; + should(session.isReady).be.true(); + should(serverManager.calledStart).be.true(); + should(session.isInErrorState).be.true(); + should(session.errorMessage).equal('error'); + }); - it('Should be ready when session manager is ready', async function(): Promise { - serverManager.result = new Promise((resolve) => { - serverManager.isStarted = true; - resolve(); - }); - mockSessionManager.setup(s => s.ready).returns(() => Promise.resolve()); + it('Should be ready when session manager is ready', async function (): Promise { + serverManager.result = new Promise((resolve) => { + serverManager.isStarted = true; + resolve(); + }); + mockSessionManager.setup(s => s.ready).returns(() => Promise.resolve()); - // When I call initialize - await session.initialize(); + // When I call initialize + await session.initialize(); - // Then - should(session.isReady).be.true(); - should(session.isInErrorState).be.false(); - await session.ready; - }); + // Then + should(session.isReady).be.true(); + should(session.isInErrorState).be.false(); + await session.ready; + }); - it('Should be in error state if server fails to start', async function(): Promise { - serverManager.result = new Promise((resolve) => { - serverManager.isStarted = false; - resolve(); - }); - mockSessionManager.setup(s => s.ready).returns(() => Promise.resolve()); + it('Should be in error state if server fails to start', async function (): Promise { + serverManager.result = new Promise((resolve) => { + serverManager.isStarted = false; + resolve(); + }); + mockSessionManager.setup(s => s.ready).returns(() => Promise.resolve()); - // When I call initialize - await session.initialize(); + // When I call initialize + await session.initialize(); - // Then - await session.ready; - should(session.isReady).be.true(); - should(session.isInErrorState).be.true(); - }); + // Then + await session.ready; + should(session.isReady).be.true(); + should(session.isInErrorState).be.true(); + }); - it('Should go to error state if sessionManager fails', async function(): Promise { - serverManager.isStarted = true; - mockSessionManager.setup(s => s.isReady).returns(() => false); - mockSessionManager.setup(s => s.ready).returns(() => Promise.reject('error')); + it('Should go to error state if sessionManager fails', async function (): Promise { + serverManager.isStarted = true; + mockSessionManager.setup(s => s.isReady).returns(() => false); + mockSessionManager.setup(s => s.ready).returns(() => Promise.reject('error')); - // When I call initialize - await session.initialize(); + // When I call initialize + await session.initialize(); - // Then - should(session.isReady).be.true(); - should(session.isInErrorState).be.true(); - should(session.errorMessage).equal('error'); - }); + // Then + should(session.isReady).be.true(); + should(session.isInErrorState).be.true(); + should(session.errorMessage).equal('error'); + }); - it('Should start session automatically if kernel preference requests it', async function(): Promise { - serverManager.isStarted = true; - mockSessionManager.setup(s => s.ready).returns(() => Promise.resolve()); - let sessionMock = TypeMoq.Mock.ofType(EmptySession); - let startOptions: nb.ISessionOptions = undefined; - mockSessionManager.setup(s => s.startNew(TypeMoq.It.isAny())).returns((options) => { - startOptions = options; - return Promise.resolve(sessionMock.object); - }); + it('Should start session automatically if kernel preference requests it', async function (): Promise { + serverManager.isStarted = true; + mockSessionManager.setup(s => s.ready).returns(() => Promise.resolve()); + let sessionMock = TypeMoq.Mock.ofType(EmptySession); + let startOptions: nb.ISessionOptions = undefined; + mockSessionManager.setup(s => s.startNew(TypeMoq.It.isAny())).returns((options) => { + startOptions = options; + return Promise.resolve(sessionMock.object); + }); - // When I call initialize after defining kernel preferences - session.kernelPreference = { - shouldStart: true, - name: 'python' - }; - await session.initialize(); + // When I call initialize after defining kernel preferences + session.kernelPreference = { + shouldStart: true, + name: 'python' + }; + await session.initialize(); - // Then - should(session.isReady).be.true(); - should(session.isInErrorState).be.false(); - should(startOptions.kernelName).equal('python'); - should(startOptions.path).equal(path.fsPath); - }); + // Then + should(session.isReady).be.true(); + should(session.isInErrorState).be.false(); + should(startOptions.kernelName).equal('python'); + should(startOptions.path).equal(path.fsPath); + }); - it('Should shutdown session even if no serverManager is set', async function(): Promise { - // Given a session against a remote server - let expectedId = 'abc'; - mockSessionManager.setup(s => s.isReady).returns(() => true); - mockSessionManager.setup(s => s.shutdown(TypeMoq.It.isAny())).returns(() => Promise.resolve()); - let sessionMock = TypeMoq.Mock.ofType(EmptySession); - sessionMock.setup(s => s.id).returns(() => expectedId); - mockSessionManager.setup(s => s.startNew(TypeMoq.It.isAny())).returns(() => Promise.resolve(sessionMock.object)); + it('Should shutdown session even if no serverManager is set', async function (): Promise { + // Given a session against a remote server + let expectedId = 'abc'; + mockSessionManager.setup(s => s.isReady).returns(() => true); + mockSessionManager.setup(s => s.shutdown(TypeMoq.It.isAny())).returns(() => Promise.resolve()); + let sessionMock = TypeMoq.Mock.ofType(EmptySession); + sessionMock.setup(s => s.id).returns(() => expectedId); + mockSessionManager.setup(s => s.startNew(TypeMoq.It.isAny())).returns(() => Promise.resolve(sessionMock.object)); - remoteSession.kernelPreference = { - shouldStart: true, - name: 'python' - }; - await remoteSession.initialize(); + remoteSession.kernelPreference = { + shouldStart: true, + name: 'python' + }; + await remoteSession.initialize(); - // When I call shutdown - await remoteSession.shutdown(); + // When I call shutdown + await remoteSession.shutdown(); - // Then - mockSessionManager.verify(s => s.shutdown(TypeMoq.It.isValue(expectedId)), TypeMoq.Times.once()); - }); + // Then + mockSessionManager.verify(s => s.shutdown(TypeMoq.It.isValue(expectedId)), TypeMoq.Times.once()); + }); - it('Should stop server if server is set', async function(): Promise { - // Given a kernel has been started - serverManager.isStarted = true; - serverManager.result = Promise.resolve(); - mockSessionManager.setup(s => s.isReady).returns(() => true); - mockSessionManager.setup(s => s.shutdown(TypeMoq.It.isAny())).returns(() => Promise.resolve()); + it('Should stop server if server is set', async function (): Promise { + // Given a kernel has been started + serverManager.isStarted = true; + serverManager.result = Promise.resolve(); + mockSessionManager.setup(s => s.isReady).returns(() => true); + mockSessionManager.setup(s => s.shutdown(TypeMoq.It.isAny())).returns(() => Promise.resolve()); - await session.initialize(); + await session.initialize(); - // When I call shutdown - await session.shutdown(); + // When I call shutdown + await session.shutdown(); - // Then - should(serverManager.calledEnd).be.true(); - }); + // Then + should(serverManager.calledEnd).be.true(); + }); }); diff --git a/src/sqltest/parts/notebook/model/contentManagers.test.ts b/src/sqltest/parts/notebook/model/contentManagers.test.ts index 14ef0ac411..98079ace7e 100644 --- a/src/sqltest/parts/notebook/model/contentManagers.test.ts +++ b/src/sqltest/parts/notebook/model/contentManagers.test.ts @@ -6,109 +6,107 @@ 'use strict'; import * as should from 'should'; -import * as TypeMoq from 'typemoq'; -import * as path from 'path'; import { nb } from 'sqlops'; import URI from 'vs/base/common/uri'; import * as tempWrite from 'temp-write'; -import { LocalContentManager } from 'sql/services/notebook/localContentManager'; +import { LocalContentManager } from 'sql/workbench/services/notebook/node/localContentManager'; import * as testUtils from '../../../utils/testUtils'; import { CellTypes } from 'sql/parts/notebook/models/contracts'; let expectedNotebookContent: nb.INotebookContents = { - cells: [{ - cell_type: CellTypes.Code, - source: 'insert into t1 values (c1, c2)', - metadata: { language: 'python' }, - execution_count: 1 - }], - metadata: { - kernelspec: { - name: 'mssql', - language: 'sql' - } - }, - nbformat: 4, - nbformat_minor: 2 + cells: [{ + cell_type: CellTypes.Code, + source: 'insert into t1 values (c1, c2)', + metadata: { language: 'python' }, + execution_count: 1 + }], + metadata: { + kernelspec: { + name: 'mssql', + language: 'sql' + } + }, + nbformat: 4, + nbformat_minor: 2 }; let notebookContentString = JSON.stringify(expectedNotebookContent); function verifyMatchesExpectedNotebook(notebook: nb.INotebookContents): void { - should(notebook.cells).have.length(1, 'Expected 1 cell'); - should(notebook.cells[0].cell_type).equal(CellTypes.Code); - should(notebook.cells[0].source).equal(expectedNotebookContent.cells[0].source); - should(notebook.metadata.kernelspec.name).equal(expectedNotebookContent.metadata.kernelspec.name); - should(notebook.nbformat).equal(expectedNotebookContent.nbformat); - should(notebook.nbformat_minor).equal(expectedNotebookContent.nbformat_minor); + should(notebook.cells).have.length(1, 'Expected 1 cell'); + should(notebook.cells[0].cell_type).equal(CellTypes.Code); + should(notebook.cells[0].source).equal(expectedNotebookContent.cells[0].source); + should(notebook.metadata.kernelspec.name).equal(expectedNotebookContent.metadata.kernelspec.name); + should(notebook.nbformat).equal(expectedNotebookContent.nbformat); + should(notebook.nbformat_minor).equal(expectedNotebookContent.nbformat_minor); } -describe('Local Content Manager', function(): void { - let contentManager = new LocalContentManager(); +describe('Local Content Manager', function (): void { + let contentManager = new LocalContentManager(); - it('Should return undefined if path is undefined', async function(): Promise { - let content = await contentManager.getNotebookContents(undefined); - should(content).be.undefined(); - // tslint:disable-next-line:no-null-keyword - content = await contentManager.getNotebookContents(null); - should(content).be.undefined(); - }); + it('Should return undefined if path is undefined', async function (): Promise { + let content = await contentManager.getNotebookContents(undefined); + should(content).be.undefined(); + // tslint:disable-next-line:no-null-keyword + content = await contentManager.getNotebookContents(null); + should(content).be.undefined(); + }); - it('Should throw if file does not exist', async function(): Promise { - await testUtils.assertThrowsAsync(async () => await contentManager.getNotebookContents(URI.file('/path/doesnot/exist.ipynb')), undefined); - }); - it('Should return notebook contents parsed as INotebook when valid notebook file parsed', async function(): Promise { - // Given a file containing a valid notebook - let localFile = tempWrite.sync(notebookContentString, 'notebook.ipynb'); - // when I read the content - let notebook = await contentManager.getNotebookContents(URI.file(localFile)); - // then I expect notebook format to match - verifyMatchesExpectedNotebook(notebook); - }); - it('Should ignore invalid content in the notebook file', async function(): Promise { - // Given a file containing a notebook with some garbage properties - let invalidContent = notebookContentString + '\\nasddfdsafasdf'; - let localFile = tempWrite.sync(invalidContent, 'notebook.ipynb'); - // when I read the content - let notebook = await contentManager.getNotebookContents(URI.file(localFile)); - // then I expect notebook format to still be valid - verifyMatchesExpectedNotebook(notebook); - }); - it('Should inline mime data into a single string', async function(): Promise { - let mimeNotebook: nb.INotebookContents = { - cells: [{ - cell_type: CellTypes.Code, - source: 'insert into t1 values (c1, c2)', - metadata: { language: 'python' }, - execution_count: 1, - outputs: [ - { - output_type: 'display_data', - data: { - 'text/html': [ - '
', - '
' - ] - } - } - ] - }], - metadata: { - kernelspec: { - name: 'mssql', - language: 'sql' - } - }, - nbformat: 4, - nbformat_minor: 2 - }; - let mimeContentString = JSON.stringify(mimeNotebook); - // Given a file containing a valid notebook with multiline mime type - let localFile = tempWrite.sync(mimeContentString, 'notebook.ipynb'); - // when I read the content - let notebook = await contentManager.getNotebookContents(URI.file(localFile)); - // then I expect output to have been normalized into a single string - let displayOutput = notebook.cells[0].outputs[0]; - should(displayOutput.data['text/html']).equal('
'); - }); + it('Should throw if file does not exist', async function (): Promise { + await testUtils.assertThrowsAsync(async () => await contentManager.getNotebookContents(URI.file('/path/doesnot/exist.ipynb')), undefined); + }); + it('Should return notebook contents parsed as INotebook when valid notebook file parsed', async function (): Promise { + // Given a file containing a valid notebook + let localFile = tempWrite.sync(notebookContentString, 'notebook.ipynb'); + // when I read the content + let notebook = await contentManager.getNotebookContents(URI.file(localFile)); + // then I expect notebook format to match + verifyMatchesExpectedNotebook(notebook); + }); + it('Should ignore invalid content in the notebook file', async function (): Promise { + // Given a file containing a notebook with some garbage properties + let invalidContent = notebookContentString + '\\nasddfdsafasdf'; + let localFile = tempWrite.sync(invalidContent, 'notebook.ipynb'); + // when I read the content + let notebook = await contentManager.getNotebookContents(URI.file(localFile)); + // then I expect notebook format to still be valid + verifyMatchesExpectedNotebook(notebook); + }); + it('Should inline mime data into a single string', async function (): Promise { + let mimeNotebook: nb.INotebookContents = { + cells: [{ + cell_type: CellTypes.Code, + source: 'insert into t1 values (c1, c2)', + metadata: { language: 'python' }, + execution_count: 1, + outputs: [ + { + output_type: 'display_data', + data: { + 'text/html': [ + '
', + '
' + ] + } + } + ] + }], + metadata: { + kernelspec: { + name: 'mssql', + language: 'sql' + } + }, + nbformat: 4, + nbformat_minor: 2 + }; + let mimeContentString = JSON.stringify(mimeNotebook); + // Given a file containing a valid notebook with multiline mime type + let localFile = tempWrite.sync(mimeContentString, 'notebook.ipynb'); + // when I read the content + let notebook = await contentManager.getNotebookContents(URI.file(localFile)); + // then I expect output to have been normalized into a single string + let displayOutput = notebook.cells[0].outputs[0]; + should(displayOutput.data['text/html']).equal('
'); + }); }); diff --git a/src/sqltest/parts/notebook/model/notebookModel.test.ts b/src/sqltest/parts/notebook/model/notebookModel.test.ts index 7f638870e2..ff1cd95240 100644 --- a/src/sqltest/parts/notebook/model/notebookModel.test.ts +++ b/src/sqltest/parts/notebook/model/notebookModel.test.ts @@ -13,7 +13,7 @@ import { INotificationService } from 'vs/platform/notification/common/notificati import { TestNotificationService } from 'vs/platform/notification/test/common/testNotificationService'; import URI from 'vs/base/common/uri'; -import { LocalContentManager } from 'sql/services/notebook/localContentManager'; +import { LocalContentManager } from 'sql/workbench/services/notebook/node/localContentManager'; import * as testUtils from '../../../utils/testUtils'; import { NotebookManagerStub } from '../common'; import { NotebookModel } from 'sql/parts/notebook/models/notebookModel'; @@ -22,47 +22,47 @@ import { IClientSession, ICellModel, INotebookModelOptions } from 'sql/parts/not import { ClientSession } from 'sql/parts/notebook/models/clientSession'; import { CellTypes } from 'sql/parts/notebook/models/contracts'; import { Deferred } from 'sql/base/common/promise'; -import { ConnectionManagementService } from 'sql/parts/connection/common/connectionManagementService'; +import { ConnectionManagementService } from 'sql/platform/connection/common/connectionManagementService'; import { Memento } from 'vs/workbench/common/memento'; import { Emitter } from 'vs/base/common/event'; let expectedNotebookContent: nb.INotebookContents = { - cells: [{ - cell_type: CellTypes.Code, - source: 'insert into t1 values (c1, c2)', - metadata: { language: 'python' }, - execution_count: 1 - }, { - cell_type: CellTypes.Markdown, - source: 'I am *markdown*', - metadata: { language: 'python' }, - execution_count: 1 - }], - metadata: { - kernelspec: { - name: 'mssql', - language: 'sql' - } - }, - nbformat: 4, - nbformat_minor: 5 + cells: [{ + cell_type: CellTypes.Code, + source: 'insert into t1 values (c1, c2)', + metadata: { language: 'python' }, + execution_count: 1 + }, { + cell_type: CellTypes.Markdown, + source: 'I am *markdown*', + metadata: { language: 'python' }, + execution_count: 1 + }], + metadata: { + kernelspec: { + name: 'mssql', + language: 'sql' + } + }, + nbformat: 4, + nbformat_minor: 5 }; let expectedNotebookContentOneCell: nb.INotebookContents = { - cells: [{ - cell_type: CellTypes.Code, - source: 'insert into t1 values (c1, c2)', - metadata: { language: 'python' }, - execution_count: 1 - }], - metadata: { - kernelspec: { - name: 'mssql', - language: 'sql' - } - }, - nbformat: 4, - nbformat_minor: 5 + cells: [{ + cell_type: CellTypes.Code, + source: 'insert into t1 values (c1, c2)', + metadata: { language: 'python' }, + execution_count: 1 + }], + metadata: { + kernelspec: { + name: 'mssql', + language: 'sql' + } + }, + nbformat: 4, + nbformat_minor: 5 }; let defaultUri = URI.file('/some/path.ipynb'); @@ -72,180 +72,181 @@ let sessionReady: Deferred; let mockModelFactory: TypeMoq.Mock; let notificationService: TypeMoq.Mock; -describe('notebook model', function(): void { - let notebookManagers = [new NotebookManagerStub()]; - let memento: TypeMoq.Mock; - let queryConnectionService: TypeMoq.Mock; - let defaultModelOptions: INotebookModelOptions; - beforeEach(() => { - sessionReady = new Deferred(); - notificationService = TypeMoq.Mock.ofType(TestNotificationService, TypeMoq.MockBehavior.Loose); - memento = TypeMoq.Mock.ofType(Memento, TypeMoq.MockBehavior.Loose, ''); - memento.setup(x => x.getMemento(TypeMoq.It.isAny())).returns(() => void 0); - queryConnectionService = TypeMoq.Mock.ofType(ConnectionManagementService, TypeMoq.MockBehavior.Loose, memento.object, undefined); - queryConnectionService.callBase = true; - defaultModelOptions = { - notebookUri: defaultUri, - factory: new ModelFactory(), - notebookManagers, - notificationService: notificationService.object, - connectionService: queryConnectionService.object, - providerId: 'jupyter' }; - mockClientSession = TypeMoq.Mock.ofType(ClientSession, undefined, defaultModelOptions); - mockClientSession.setup(c => c.initialize(TypeMoq.It.isAny())).returns(() => { - return Promise.resolve(); - }); - mockClientSession.setup(c => c.ready).returns(() => sessionReady.promise); - mockModelFactory = TypeMoq.Mock.ofType(ModelFactory); - mockModelFactory.callBase = true; - mockModelFactory.setup(f => f.createClientSession(TypeMoq.It.isAny())).returns(() => { - return mockClientSession.object; - }); - }); +describe('notebook model', function (): void { + let notebookManagers = [new NotebookManagerStub()]; + let memento: TypeMoq.Mock; + let queryConnectionService: TypeMoq.Mock; + let defaultModelOptions: INotebookModelOptions; + beforeEach(() => { + sessionReady = new Deferred(); + notificationService = TypeMoq.Mock.ofType(TestNotificationService, TypeMoq.MockBehavior.Loose); + memento = TypeMoq.Mock.ofType(Memento, TypeMoq.MockBehavior.Loose, ''); + memento.setup(x => x.getMemento(TypeMoq.It.isAny())).returns(() => void 0); + queryConnectionService = TypeMoq.Mock.ofType(ConnectionManagementService, TypeMoq.MockBehavior.Loose, memento.object, undefined); + queryConnectionService.callBase = true; + defaultModelOptions = { + notebookUri: defaultUri, + factory: new ModelFactory(), + notebookManagers, + notificationService: notificationService.object, + connectionService: queryConnectionService.object, + providerId: 'jupyter' + }; + mockClientSession = TypeMoq.Mock.ofType(ClientSession, undefined, defaultModelOptions); + mockClientSession.setup(c => c.initialize(TypeMoq.It.isAny())).returns(() => { + return Promise.resolve(); + }); + mockClientSession.setup(c => c.ready).returns(() => sessionReady.promise); + mockModelFactory = TypeMoq.Mock.ofType(ModelFactory); + mockModelFactory.callBase = true; + mockModelFactory.setup(f => f.createClientSession(TypeMoq.It.isAny())).returns(() => { + return mockClientSession.object; + }); + }); - it('Should create no cells if model has no contents', async function(): Promise { - // Given an empty notebook - let emptyNotebook: nb.INotebookContents = { - cells: [], - metadata: { - kernelspec: { - name: 'mssql', - language: 'sql' - } - }, - nbformat: 4, - nbformat_minor: 5 - }; + it('Should create no cells if model has no contents', async function (): Promise { + // Given an empty notebook + let emptyNotebook: nb.INotebookContents = { + cells: [], + metadata: { + kernelspec: { + name: 'mssql', + language: 'sql' + } + }, + nbformat: 4, + nbformat_minor: 5 + }; - let mockContentManager = TypeMoq.Mock.ofType(LocalContentManager); - mockContentManager.setup(c => c.getNotebookContents(TypeMoq.It.isAny())).returns(() => Promise.resolve(emptyNotebook)); - notebookManagers[0].contentManager = mockContentManager.object; + let mockContentManager = TypeMoq.Mock.ofType(LocalContentManager); + mockContentManager.setup(c => c.getNotebookContents(TypeMoq.It.isAny())).returns(() => Promise.resolve(emptyNotebook)); + notebookManagers[0].contentManager = mockContentManager.object; - // When I initialize the model - let model = new NotebookModel(defaultModelOptions); - await model.requestModelLoad(); + // When I initialize the model + let model = new NotebookModel(defaultModelOptions); + await model.requestModelLoad(); - // Then I expect to have 0 code cell as the contents - should(model.cells).have.length(0); - }); + // Then I expect to have 0 code cell as the contents + should(model.cells).have.length(0); + }); - it('Should throw if model load fails', async function(): Promise { - // Given a call to get Contents fails - let error = new Error('File not found'); - let mockContentManager = TypeMoq.Mock.ofType(LocalContentManager); - mockContentManager.setup(c => c.getNotebookContents(TypeMoq.It.isAny())).throws(error); - notebookManagers[0].contentManager = mockContentManager.object; + it('Should throw if model load fails', async function (): Promise { + // Given a call to get Contents fails + let error = new Error('File not found'); + let mockContentManager = TypeMoq.Mock.ofType(LocalContentManager); + mockContentManager.setup(c => c.getNotebookContents(TypeMoq.It.isAny())).throws(error); + notebookManagers[0].contentManager = mockContentManager.object; - // When I initalize the model - // Then it should throw - let model = new NotebookModel(defaultModelOptions); - should(model.inErrorState).be.false(); - await testUtils.assertThrowsAsync(() => model.requestModelLoad(), error.message); - should(model.inErrorState).be.true(); - }); + // When I initalize the model + // Then it should throw + let model = new NotebookModel(defaultModelOptions); + should(model.inErrorState).be.false(); + await testUtils.assertThrowsAsync(() => model.requestModelLoad(), error.message); + should(model.inErrorState).be.true(); + }); - it('Should convert cell info to CellModels', async function(): Promise { - // Given a notebook with 2 cells - let mockContentManager = TypeMoq.Mock.ofType(LocalContentManager); - mockContentManager.setup(c => c.getNotebookContents(TypeMoq.It.isAny())).returns(() => Promise.resolve(expectedNotebookContent)); - notebookManagers[0].contentManager = mockContentManager.object; + it('Should convert cell info to CellModels', async function (): Promise { + // Given a notebook with 2 cells + let mockContentManager = TypeMoq.Mock.ofType(LocalContentManager); + mockContentManager.setup(c => c.getNotebookContents(TypeMoq.It.isAny())).returns(() => Promise.resolve(expectedNotebookContent)); + notebookManagers[0].contentManager = mockContentManager.object; - // When I initalize the model - let model = new NotebookModel(defaultModelOptions); - await model.requestModelLoad(); + // When I initalize the model + let model = new NotebookModel(defaultModelOptions); + await model.requestModelLoad(); - // Then I expect all cells to be in the model - should(model.cells).have.length(2); - should(model.cells[0].source).be.equal(expectedNotebookContent.cells[0].source); - should(model.cells[1].source).be.equal(expectedNotebookContent.cells[1].source); - }); + // Then I expect all cells to be in the model + should(model.cells).have.length(2); + should(model.cells[0].source).be.equal(expectedNotebookContent.cells[0].source); + should(model.cells[1].source).be.equal(expectedNotebookContent.cells[1].source); + }); - it('Should load contents but then go to error state if client session startup fails', async function(): Promise { - let mockContentManager = TypeMoq.Mock.ofType(LocalContentManager); - mockContentManager.setup(c => c.getNotebookContents(TypeMoq.It.isAny())).returns(() => Promise.resolve(expectedNotebookContentOneCell)); - notebookManagers[0].contentManager = mockContentManager.object; + it('Should load contents but then go to error state if client session startup fails', async function (): Promise { + let mockContentManager = TypeMoq.Mock.ofType(LocalContentManager); + mockContentManager.setup(c => c.getNotebookContents(TypeMoq.It.isAny())).returns(() => Promise.resolve(expectedNotebookContentOneCell)); + notebookManagers[0].contentManager = mockContentManager.object; - // Given I have a session that fails to start - mockClientSession.setup(c => c.isInErrorState).returns(() => true); - mockClientSession.setup(c => c.errorMessage).returns(() => 'Error'); - sessionReady.resolve(); - let sessionFired = false; + // Given I have a session that fails to start + mockClientSession.setup(c => c.isInErrorState).returns(() => true); + mockClientSession.setup(c => c.errorMessage).returns(() => 'Error'); + sessionReady.resolve(); + let sessionFired = false; - let options: INotebookModelOptions = Object.assign({}, defaultModelOptions, > { - factory: mockModelFactory.object - }); - let model = new NotebookModel(options); - model.onClientSessionReady((session) => sessionFired = true); - await model.requestModelLoad(); - model.backgroundStartSession(); + let options: INotebookModelOptions = Object.assign({}, defaultModelOptions, >{ + factory: mockModelFactory.object + }); + let model = new NotebookModel(options); + model.onClientSessionReady((session) => sessionFired = true); + await model.requestModelLoad(); + model.backgroundStartSession(); - // Then I expect load to succeed - shouldHaveOneCell(model); - should(model.clientSession).not.be.undefined(); - // but on server load completion I expect error state to be set - // Note: do not expect serverLoad event to throw even if failed - await model.sessionLoadFinished; - should(model.inErrorState).be.true(); - should(sessionFired).be.false(); - }); + // Then I expect load to succeed + shouldHaveOneCell(model); + should(model.clientSession).not.be.undefined(); + // but on server load completion I expect error state to be set + // Note: do not expect serverLoad event to throw even if failed + await model.sessionLoadFinished; + should(model.inErrorState).be.true(); + should(sessionFired).be.false(); + }); - it('Should not be in error state if client session initialization succeeds', async function(): Promise { - let mockContentManager = TypeMoq.Mock.ofType(LocalContentManager); - mockContentManager.setup(c => c.getNotebookContents(TypeMoq.It.isAny())).returns(() => Promise.resolve(expectedNotebookContentOneCell)); - notebookManagers[0].contentManager = mockContentManager.object; - let kernelChangedEmitter: Emitter = new Emitter(); + it('Should not be in error state if client session initialization succeeds', async function (): Promise { + let mockContentManager = TypeMoq.Mock.ofType(LocalContentManager); + mockContentManager.setup(c => c.getNotebookContents(TypeMoq.It.isAny())).returns(() => Promise.resolve(expectedNotebookContentOneCell)); + notebookManagers[0].contentManager = mockContentManager.object; + let kernelChangedEmitter: Emitter = new Emitter(); - mockClientSession.setup(c => c.isInErrorState).returns(() => false); - mockClientSession.setup(c => c.isReady).returns(() => true); - mockClientSession.setup(c => c.kernelChanged).returns(() => kernelChangedEmitter.event); + mockClientSession.setup(c => c.isInErrorState).returns(() => false); + mockClientSession.setup(c => c.isReady).returns(() => true); + mockClientSession.setup(c => c.kernelChanged).returns(() => kernelChangedEmitter.event); - queryConnectionService.setup(c => c.getActiveConnections(TypeMoq.It.isAny())).returns(() => null); + queryConnectionService.setup(c => c.getActiveConnections(TypeMoq.It.isAny())).returns(() => null); - sessionReady.resolve(); - let actualSession: IClientSession = undefined; + sessionReady.resolve(); + let actualSession: IClientSession = undefined; - let options: INotebookModelOptions = Object.assign({}, defaultModelOptions, > { - factory: mockModelFactory.object - }); - let model = new NotebookModel(options, false); - model.onClientSessionReady((session) => actualSession = session); - await model.requestModelLoad(); - model.backgroundStartSession(); + let options: INotebookModelOptions = Object.assign({}, defaultModelOptions, >{ + factory: mockModelFactory.object + }); + let model = new NotebookModel(options, false); + model.onClientSessionReady((session) => actualSession = session); + await model.requestModelLoad(); + model.backgroundStartSession(); - // Then I expect load to succeed - should(model.clientSession).not.be.undefined(); - // but on server load completion I expect error state to be set - // Note: do not expect serverLoad event to throw even if failed - let kernelChangedArg: nb.IKernelChangedArgs = undefined; - model.kernelChanged((kernel) => kernelChangedArg = kernel); - await model.sessionLoadFinished; - should(model.inErrorState).be.false(); - should(actualSession).equal(mockClientSession.object); - should(model.clientSession).equal(mockClientSession.object); - }); + // Then I expect load to succeed + should(model.clientSession).not.be.undefined(); + // but on server load completion I expect error state to be set + // Note: do not expect serverLoad event to throw even if failed + let kernelChangedArg: nb.IKernelChangedArgs = undefined; + model.kernelChanged((kernel) => kernelChangedArg = kernel); + await model.sessionLoadFinished; + should(model.inErrorState).be.false(); + should(actualSession).equal(mockClientSession.object); + should(model.clientSession).equal(mockClientSession.object); + }); - it('Should sanitize kernel display name when IP is included', async function(): Promise { - let model = new NotebookModel(defaultModelOptions); - let displayName = 'PySpark (1.1.1.1)'; - let sanitizedDisplayName = model.sanitizeDisplayName(displayName); - should(sanitizedDisplayName).equal('PySpark'); - }); + it('Should sanitize kernel display name when IP is included', async function (): Promise { + let model = new NotebookModel(defaultModelOptions); + let displayName = 'PySpark (1.1.1.1)'; + let sanitizedDisplayName = model.sanitizeDisplayName(displayName); + should(sanitizedDisplayName).equal('PySpark'); + }); - it('Should sanitize kernel display name properly when IP is not included', async function(): Promise { - let model = new NotebookModel(defaultModelOptions); - let displayName = 'PySpark'; - let sanitizedDisplayName = model.sanitizeDisplayName(displayName); - should(sanitizedDisplayName).equal('PySpark'); - }); + it('Should sanitize kernel display name properly when IP is not included', async function (): Promise { + let model = new NotebookModel(defaultModelOptions); + let displayName = 'PySpark'; + let sanitizedDisplayName = model.sanitizeDisplayName(displayName); + should(sanitizedDisplayName).equal('PySpark'); + }); - function shouldHaveOneCell(model: NotebookModel): void { - should(model.cells).have.length(1); - verifyCellModel(model.cells[0], { cell_type: CellTypes.Code, source: 'insert into t1 values (c1, c2)', metadata: { language: 'python' }, execution_count: 1 }); - } + function shouldHaveOneCell(model: NotebookModel): void { + should(model.cells).have.length(1); + verifyCellModel(model.cells[0], { cell_type: CellTypes.Code, source: 'insert into t1 values (c1, c2)', metadata: { language: 'python' }, execution_count: 1 }); + } - function verifyCellModel(cellModel: ICellModel, expected: nb.ICellContents): void { - should(cellModel.cellType).equal(expected.cell_type); - should(cellModel.source).equal(expected.source); - } + function verifyCellModel(cellModel: ICellModel, expected: nb.ICellContents): void { + should(cellModel.cellType).equal(expected.cell_type); + should(cellModel.source).equal(expected.source); + } }); diff --git a/src/sqltest/parts/profiler/service/profilerFilter.test.ts b/src/sqltest/parts/profiler/service/profilerFilter.test.ts index 3dc363f1b5..90122df023 100644 --- a/src/sqltest/parts/profiler/service/profilerFilter.test.ts +++ b/src/sqltest/parts/profiler/service/profilerFilter.test.ts @@ -7,7 +7,7 @@ import * as assert from 'assert'; import { FilterData } from 'sql/parts/profiler/service/profilerFilter'; -import { ProfilerFilterClauseOperator, ProfilerFilter } from 'sql/parts/profiler/service/interfaces'; +import { ProfilerFilterClauseOperator, ProfilerFilter } from 'sql/workbench/services/profiler/common/interfaces'; const property1 = 'property1'; const property2 = 'property2'; diff --git a/src/sqltest/parts/query/editor/queryActions.test.ts b/src/sqltest/parts/query/editor/queryActions.test.ts index 596187ec6c..d87d09202f 100644 --- a/src/sqltest/parts/query/editor/queryActions.test.ts +++ b/src/sqltest/parts/query/editor/queryActions.test.ts @@ -15,7 +15,7 @@ import { INewConnectionParams, ConnectionType, RunQueryOnConnectionMode -} from 'sql/parts/connection/common/connectionManagement'; +} from 'sql/platform/connection/common/connectionManagement'; import { ConnectionDialogService } from 'sql/parts/connection/connectionDialog/connectionDialogService'; import { RunQueryAction, CancelQueryAction, ListDatabasesActionItem, @@ -23,9 +23,9 @@ import { } from 'sql/parts/query/execution/queryActions'; import { QueryInput } from 'sql/parts/query/common/queryInput'; import { QueryEditor } from 'sql/parts/query/editor/queryEditor'; -import { QueryModelService } from 'sql/parts/query/execution/queryModelService'; -import { ConnectionManagementService } from 'sql/parts/connection/common/connectionManagementService'; -import { IConnectionProfile } from 'sql/parts/connection/common/interfaces'; +import { QueryModelService } from 'sql/platform/query/common/queryModelService'; +import { ConnectionManagementService } from 'sql/platform/connection/common/connectionManagementService'; +import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; import { TestThemeService } from 'sqltest/stubs/themeTestService'; import { ConfigurationService } from 'vs/platform/configuration/node/configurationService'; diff --git a/src/sqltest/parts/query/editor/queryEditor.test.ts b/src/sqltest/parts/query/editor/queryEditor.test.ts index b560031a0a..75b0f88d36 100644 --- a/src/sqltest/parts/query/editor/queryEditor.test.ts +++ b/src/sqltest/parts/query/editor/queryEditor.test.ts @@ -16,10 +16,10 @@ import { UntitledEditorInput } from 'vs/workbench/common/editor/untitledEditorIn import { QueryResultsInput } from 'sql/parts/query/common/queryResultsInput'; import { QueryEditor } from 'sql/parts/query/editor/queryEditor'; -import { QueryModelService } from 'sql/parts/query/execution/queryModelService'; +import { QueryModelService } from 'sql/platform/query/common/queryModelService'; import { QueryInput } from 'sql/parts/query/common/queryInput'; -import { INewConnectionParams, ConnectionType, RunQueryOnConnectionMode } from 'sql/parts/connection/common/connectionManagement'; -import { ConnectionManagementService } from 'sql/parts/connection/common/connectionManagementService'; +import { INewConnectionParams, ConnectionType, RunQueryOnConnectionMode } from 'sql/platform/connection/common/connectionManagement'; +import { ConnectionManagementService } from 'sql/platform/connection/common/connectionManagementService'; import { RunQueryAction, ListDatabasesActionItem } from 'sql/parts/query/execution/queryActions'; import { EditorDescriptorService } from 'sql/parts/query/editor/editorDescriptorService'; diff --git a/src/sqltest/parts/registeredServer/viewlet/serverTreeView.test.ts b/src/sqltest/parts/registeredServer/viewlet/serverTreeView.test.ts index dc34f6213a..47a83d683c 100644 --- a/src/sqltest/parts/registeredServer/viewlet/serverTreeView.test.ts +++ b/src/sqltest/parts/registeredServer/viewlet/serverTreeView.test.ts @@ -5,9 +5,9 @@ 'use strict'; -import { IConnectionProfile } from 'sql/parts/connection/common/interfaces'; +import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; import { ServerTreeView } from 'sql/parts/objectExplorer/viewlet/serverTreeView'; -import { ConnectionManagementService } from 'sql/parts/connection/common/connectionManagementService'; +import { ConnectionManagementService } from 'sql/platform/connection/common/connectionManagementService'; import { Tree } from 'vs/base/parts/tree/browser/treeImpl'; import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock'; @@ -24,7 +24,7 @@ suite('ServerTreeView onAddConnectionProfile handler tests', () => { let instantiationService = new TestInstantiationService(); let mockConnectionManagementService = TypeMoq.Mock.ofType(ConnectionManagementService, TypeMoq.MockBehavior.Strict, {}, {}); mockConnectionManagementService.setup(x => x.getConnectionGroups()).returns(x => []); - serverTreeView = new ServerTreeView(mockConnectionManagementService.object, instantiationService, undefined, undefined, undefined, undefined, undefined); + serverTreeView = new ServerTreeView(mockConnectionManagementService.object, instantiationService, undefined, undefined, undefined, undefined); let tree = { clearSelection() { }, getSelection() { }, diff --git a/src/sqltest/platform/dialog/dialogPane.test.ts b/src/sqltest/platform/dialog/dialogPane.test.ts index 0c8b86759f..60b29de6e3 100644 --- a/src/sqltest/platform/dialog/dialogPane.test.ts +++ b/src/sqltest/platform/dialog/dialogPane.test.ts @@ -3,15 +3,14 @@ * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ +'use strict'; + import * as assert from 'assert'; -import { Mock, It, Times, GlobalMock } from 'typemoq'; import { Dialog, DialogTab } from 'sql/platform/dialog/dialogTypes'; import { DialogPane } from 'sql/platform/dialog/dialogPane'; import { DialogComponentParams } from 'sql/platform/dialog/dialogContainer.component'; -import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; import { bootstrapAngular } from 'sql/services/bootstrap/bootstrapService'; -'use strict'; interface BootstrapAngular { (collection, moduleType, container, selectorString, params: DialogComponentParams, input, callbackSetModule): void; diff --git a/src/sqltest/services/accountManagement/accountManagementService.test.ts b/src/sqltest/services/accountManagement/accountManagementService.test.ts index a0e259f632..e6dc7e444d 100644 --- a/src/sqltest/services/accountManagement/accountManagementService.test.ts +++ b/src/sqltest/services/accountManagement/accountManagementService.test.ts @@ -8,11 +8,11 @@ import * as assert from 'assert'; import * as sqlops from 'sqlops'; import * as TypeMoq from 'typemoq'; -import AccountStore from 'sql/services/accountManagement/accountStore'; +import AccountStore from 'sql/platform/accountManagement/common/accountStore'; import { AccountDialogController } from 'sql/parts/accountManagement/accountDialog/accountDialogController'; -import { AccountManagementService } from 'sql/services/accountManagement/accountManagementService'; -import { AccountAdditionResult, AccountProviderAddedEventParams, UpdateAccountListEventParams } from 'sql/services/accountManagement/eventTypes'; -import { IAccountStore } from 'sql/services/accountManagement/interfaces'; +import { AccountManagementService } from 'sql/workbench/services/accountManagement/browser/accountManagementService'; +import { AccountAdditionResult, AccountProviderAddedEventParams, UpdateAccountListEventParams } from 'sql/platform/accountManagement/common/eventTypes'; +import { IAccountStore } from 'sql/platform/accountManagement/common/interfaces'; import { AccountProviderStub } from 'sqltest/stubs/accountManagementStubs'; import { EventVerifierSingle } from 'sqltest/utils/eventVerifier'; import { InstantiationService } from 'vs/platform/instantiation/common/instantiationService'; diff --git a/src/sqltest/services/accountManagement/accountStore.test.ts b/src/sqltest/services/accountManagement/accountStore.test.ts index 0488e75c28..9650b8f6b6 100644 --- a/src/sqltest/services/accountManagement/accountStore.test.ts +++ b/src/sqltest/services/accountManagement/accountStore.test.ts @@ -7,7 +7,7 @@ import * as assert from 'assert'; import * as sqlops from 'sqlops'; -import AccountStore from 'sql/services/accountManagement/accountStore'; +import AccountStore from 'sql/platform/accountManagement/common/accountStore'; import { EventVerifierSingle } from 'sqltest/utils/eventVerifier'; suite('Account Store Tests', () => { diff --git a/src/sqltest/stubs/accountManagementStubs.ts b/src/sqltest/stubs/accountManagementStubs.ts index 3cf02663e3..e60f31f82b 100644 --- a/src/sqltest/stubs/accountManagementStubs.ts +++ b/src/sqltest/stubs/accountManagementStubs.ts @@ -7,8 +7,8 @@ import * as sqlops from 'sqlops'; import { Event } from 'vs/base/common/event'; -import { IAccountManagementService } from 'sql/services/accountManagement/interfaces'; -import { AccountProviderAddedEventParams, UpdateAccountListEventParams } from 'sql/services/accountManagement/eventTypes'; +import { IAccountManagementService } from 'sql/platform/accountManagement/common/interfaces'; +import { AccountProviderAddedEventParams, UpdateAccountListEventParams } from 'sql/platform/accountManagement/common/eventTypes'; import { TPromise } from 'vs/base/common/winjs.base'; export class AccountManagementTestService implements IAccountManagementService { diff --git a/src/sqltest/stubs/capabilitiesTestService.ts b/src/sqltest/stubs/capabilitiesTestService.ts index 26af590279..618241ba93 100644 --- a/src/sqltest/stubs/capabilitiesTestService.ts +++ b/src/sqltest/stubs/capabilitiesTestService.ts @@ -5,8 +5,8 @@ 'use strict'; import * as sqlops from 'sqlops'; -import { ConnectionManagementInfo } from 'sql/parts/connection/common/connectionManagementInfo'; -import { ICapabilitiesService, clientCapabilities, ProviderFeatures } from 'sql/services/capabilities/capabilitiesService'; +import { ConnectionManagementInfo } from 'sql/platform/connection/common/connectionManagementInfo'; +import { ICapabilitiesService, ProviderFeatures } from 'sql/platform/capabilities/common/capabilitiesService'; import { ConnectionOptionSpecialType, ServiceOptionType } from 'sql/workbench/api/common/sqlExtHostTypes'; import { Event, Emitter } from 'vs/base/common/event'; @@ -16,8 +16,6 @@ export class CapabilitiesTestService implements ICapabilitiesService { public _serviceBrand: any; - private _providers: sqlops.CapabilitiesProvider[] = []; - public capabilities: { [id: string]: ProviderFeatures } = {}; constructor() { diff --git a/src/sqltest/stubs/connectionDialogTestService.ts b/src/sqltest/stubs/connectionDialogTestService.ts index d865540788..4e59cdd52d 100644 --- a/src/sqltest/stubs/connectionDialogTestService.ts +++ b/src/sqltest/stubs/connectionDialogTestService.ts @@ -6,9 +6,9 @@ import { IConnectionDialogService, IConnectionManagementService, INewConnectionParams, IConnectionResult -} from 'sql/parts/connection/common/connectionManagement'; +} from 'sql/platform/connection/common/connectionManagement'; import { TPromise } from 'vs/base/common/winjs.base'; -import { IConnectionProfile } from 'sql/parts/connection/common/interfaces'; +import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; export class ConnectionDialogTestService implements IConnectionDialogService { _serviceBrand: any; diff --git a/src/sqltest/stubs/connectionManagementService.test.ts b/src/sqltest/stubs/connectionManagementService.test.ts index 2e38571b21..2b0fa2619c 100644 --- a/src/sqltest/stubs/connectionManagementService.test.ts +++ b/src/sqltest/stubs/connectionManagementService.test.ts @@ -4,11 +4,11 @@ *--------------------------------------------------------------------------------------------*/ import { IConnectionManagementService, IConnectableInput, IConnectionCompletionOptions, IConnectionCallbacks, IConnectionResult, INewConnectionParams } - from 'sql/parts/connection/common/connectionManagement'; -import { IConnectionProfileGroup, ConnectionProfileGroup } from 'sql/parts/connection/common/connectionProfileGroup'; -import { IConnectionProfile } from 'sql/parts/connection/common/interfaces'; -import { ConnectionProfile } from 'sql/parts/connection/common/connectionProfile'; -import { ConnectionManagementInfo } from 'sql/parts/connection/common/connectionManagementInfo'; + from 'sql/platform/connection/common/connectionManagement'; +import { IConnectionProfileGroup, ConnectionProfileGroup } from 'sql/platform/connection/common/connectionProfileGroup'; +import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; +import { ConnectionProfile } from 'sql/platform/connection/common/connectionProfile'; +import { ConnectionManagementInfo } from 'sql/platform/connection/common/connectionManagementInfo'; import * as sqlops from 'sqlops'; import { Event, Emitter } from 'vs/base/common/event'; diff --git a/src/sqltest/stubs/credentialsTestStubs.ts b/src/sqltest/stubs/credentialsTestStubs.ts index 0ea2c85c92..6e6f45cbc6 100644 --- a/src/sqltest/stubs/credentialsTestStubs.ts +++ b/src/sqltest/stubs/credentialsTestStubs.ts @@ -7,7 +7,7 @@ import * as sqlops from 'sqlops'; import { TPromise } from 'vs/base/common/winjs.base'; -import { CredentialManagementEvents, ICredentialsService } from 'sql/services/credentials/credentialsService'; +import { CredentialManagementEvents, ICredentialsService } from 'sql/platform/credentials/common/credentialsService'; import { IDisposable } from 'vs/base/common/lifecycle'; export class CredentialsTestProvider implements sqlops.CredentialProvider { diff --git a/src/sqltest/stubs/errorMessageServiceStub.ts b/src/sqltest/stubs/errorMessageServiceStub.ts index 4640a1a5d3..8ddd2361dd 100644 --- a/src/sqltest/stubs/errorMessageServiceStub.ts +++ b/src/sqltest/stubs/errorMessageServiceStub.ts @@ -4,8 +4,8 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; -import { IErrorMessageService } from 'sql/parts/connection/common/connectionManagement'; import Severity from 'vs/base/common/severity'; +import { IErrorMessageService } from 'sql/platform/errorMessage/common/errorMessageService'; export class ErrorMessageServiceStub implements IErrorMessageService { _serviceBrand: any; diff --git a/src/sqltest/stubs/resourceProviderServiceStub.ts b/src/sqltest/stubs/resourceProviderServiceStub.ts index cb943ee197..0e2662034c 100644 --- a/src/sqltest/stubs/resourceProviderServiceStub.ts +++ b/src/sqltest/stubs/resourceProviderServiceStub.ts @@ -4,8 +4,8 @@ *--------------------------------------------------------------------------------------------*/ import * as sqlops from 'sqlops'; -import { IHandleFirewallRuleResult, IResourceProviderService } from 'sql/parts/accountManagement/common/interfaces'; -import { IConnectionProfile } from 'sql/parts/connection/common/interfaces'; +import { IHandleFirewallRuleResult, IResourceProviderService } from 'sql/workbench/services/resourceProvider/common/resourceProviderService'; +import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; export class ResourceProviderStub implements IResourceProviderService { _serviceBrand: any; diff --git a/src/sqltest/stubs/workspaceConfigurationTestService.ts b/src/sqltest/stubs/workspaceConfigurationTestService.ts index 17c06ae96e..d97f39a7a4 100644 --- a/src/sqltest/stubs/workspaceConfigurationTestService.ts +++ b/src/sqltest/stubs/workspaceConfigurationTestService.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; -import { IWorkspaceConfigurationService } from 'vs/workbench/services/configuration/common/configuration'; +import { IWorkspaceConfigurationService } from 'vs/workbench/services/configuration/common/configuration'; import { IConfigurationData, IConfigurationOverrides, ConfigurationTarget, IConfigurationChangeEvent } from 'vs/platform/configuration/common/configuration'; import { TPromise } from 'vs/base/common/winjs.base'; @@ -24,7 +24,7 @@ export class WorkspaceConfigurationTestService implements IWorkspaceConfiguratio onDidChangeConfiguration: Event; - getConfigurationData(): IConfigurationData { return undefined; } + getConfigurationData(): IConfigurationData { return undefined; } getConfiguration(): T; getConfiguration(section: string): T; @@ -54,7 +54,7 @@ export class WorkspaceConfigurationTestService implements IWorkspaceConfiguratio workspaceFolder: T, memory?: T, value: T, - } { return undefined; } + } { return undefined; } keys(): { default: string[]; @@ -62,7 +62,7 @@ export class WorkspaceConfigurationTestService implements IWorkspaceConfiguratio workspace: string[]; workspaceFolder: string[]; memory?: string[]; - } { return undefined; } + } { return undefined; } getUnsupportedWorkspaceKeys(): string[] { return undefined; } } diff --git a/src/sqltest/workbench/api/extHostAccountManagement.test.ts b/src/sqltest/workbench/api/extHostAccountManagement.test.ts index e8c2ee6ce5..11cf230bd9 100644 --- a/src/sqltest/workbench/api/extHostAccountManagement.test.ts +++ b/src/sqltest/workbench/api/extHostAccountManagement.test.ts @@ -15,7 +15,7 @@ import { TestInstantiationService } from 'vs/platform/instantiation/test/common/ import { IRPCProtocol } from 'vs/workbench/services/extensions/node/proxyIdentifier'; import { SqlMainContext } from 'sql/workbench/api/node/sqlExtHost.protocol'; import { MainThreadAccountManagement } from 'sql/workbench/api/node/mainThreadAccountManagement'; -import { IAccountManagementService, AzureResource } from 'sql/services/accountManagement/interfaces'; +import { IAccountManagementService, AzureResource } from 'sql/platform/accountManagement/common/interfaces'; import { createDecorator } from 'vs/platform/instantiation/common/instantiation'; const IRPCProtocol = createDecorator('rpcProtocol'); @@ -365,9 +365,9 @@ suite('ExtHostAccountManagement', () => { extHost.$getAllAccounts() .then((accounts) => { - // If: I get security token it will not throw - return extHost.$getSecurityToken(mockAccount1, AzureResource.ResourceManagement); - } + // If: I get security token it will not throw + return extHost.$getSecurityToken(mockAccount1, AzureResource.ResourceManagement); + } ).then(() => done(), (err) => done(new Error(err))); }); @@ -416,15 +416,15 @@ suite('ExtHostAccountManagement', () => { }; extHost.$getAllAccounts() - .then(accounts => { - return extHost.$getSecurityToken(mockAccount2, AzureResource.ResourceManagement); - }) - .then((noError) => { - done(new Error('Expected getSecurityToken to throw')); - }, (err) => { - // Expected error caught - done(); - }); + .then(accounts => { + return extHost.$getSecurityToken(mockAccount2, AzureResource.ResourceManagement); + }) + .then((noError) => { + done(new Error('Expected getSecurityToken to throw')); + }, (err) => { + // Expected error caught + done(); + }); }); }); @@ -448,9 +448,9 @@ function getMockAccountManagementService(accounts: sqlops.Account[]): TypeMoq.Mo mockAccountManagementService.setup(x => x.getAccountsForProvider(TypeMoq.It.isAny())) .returns(() => Promise.resolve(accounts)); mockAccountManagementService.setup(x => x.getSecurityToken(TypeMoq.It.isValue(accounts[0]), TypeMoq.It.isAny())) - .returns(() => Promise.resolve({})); + .returns(() => Promise.resolve({})); mockAccountManagementService.setup(x => x.updateAccountListEvent) - .returns(() => () => { return undefined; } ); + .returns(() => () => { return undefined; }); return mockAccountManagementService; } \ No newline at end of file diff --git a/src/sqltest/workbench/api/extHostBackgroundTaskManagement.test.ts b/src/sqltest/workbench/api/extHostBackgroundTaskManagement.test.ts index 0adc2794ce..f90b631712 100644 --- a/src/sqltest/workbench/api/extHostBackgroundTaskManagement.test.ts +++ b/src/sqltest/workbench/api/extHostBackgroundTaskManagement.test.ts @@ -3,6 +3,8 @@ * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ +'use strict'; + import * as sqlops from 'sqlops'; import * as assert from 'assert'; import { Mock, It, Times } from 'typemoq'; @@ -10,7 +12,6 @@ import { ExtHostBackgroundTaskManagement, TaskStatus } from 'sql/workbench/api/n import { MainThreadBackgroundTaskManagementShape } from 'sql/workbench/api/node/sqlExtHost.protocol'; import { IMainContext } from 'vs/workbench/api/node/extHost.protocol'; -'use strict'; suite('ExtHostBackgroundTaskManagement Tests', () => { let extHostBackgroundTaskManagement: ExtHostBackgroundTaskManagement; diff --git a/src/sqltest/workbench/api/extHostCredentialManagement.test.ts b/src/sqltest/workbench/api/extHostCredentialManagement.test.ts index 87e9b37cf0..e440ac3d5f 100644 --- a/src/sqltest/workbench/api/extHostCredentialManagement.test.ts +++ b/src/sqltest/workbench/api/extHostCredentialManagement.test.ts @@ -13,7 +13,7 @@ import { SqlMainContext } from 'sql/workbench/api/node/sqlExtHost.protocol'; import { IRPCProtocol } from 'vs/workbench/services/extensions/node/proxyIdentifier'; import { MainThreadCredentialManagement } from 'sql/workbench/api/node/mainThreadCredentialManagement'; import { CredentialsTestProvider, CredentialsTestService } from 'sqltest/stubs/credentialsTestStubs'; -import { ICredentialsService } from 'sql/services/credentials/credentialsService'; +import { ICredentialsService } from 'sql/platform/credentials/common/credentialsService'; import { Credential, CredentialProvider } from 'sqlops'; import { createDecorator } from 'vs/platform/instantiation/common/instantiation'; diff --git a/src/sqltest/workbench/api/extHostModelView.test.ts b/src/sqltest/workbench/api/extHostModelView.test.ts index 48e70f1596..fca1173a69 100644 --- a/src/sqltest/workbench/api/extHostModelView.test.ts +++ b/src/sqltest/workbench/api/extHostModelView.test.ts @@ -3,17 +3,17 @@ * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ +'use strict'; + import * as assert from 'assert'; import { Mock, It, Times, MockBehavior } from 'typemoq'; import * as sqlops from 'sqlops'; import { ExtHostModelView } from 'sql/workbench/api/node/extHostModelView'; import { MainThreadModelViewShape } from 'sql/workbench/api/node/sqlExtHost.protocol'; import { IMainContext } from 'vs/workbench/api/node/extHost.protocol'; -import { Deferred } from 'sql/base/common/promise'; import { IComponentShape, IItemConfig, ComponentEventType, IComponentEventArgs, ModelComponentTypes } from 'sql/workbench/api/common/sqlExtHostTypes'; import { TitledFormItemLayout } from 'sql/parts/modelComponents/formContainer.component'; -'use strict'; interface InternalItemConfig { toIItemConfig(): IItemConfig; } diff --git a/src/sqltest/workbench/api/extHostModelViewDialog.test.ts b/src/sqltest/workbench/api/extHostModelViewDialog.test.ts index 220495a001..4878c3f654 100644 --- a/src/sqltest/workbench/api/extHostModelViewDialog.test.ts +++ b/src/sqltest/workbench/api/extHostModelViewDialog.test.ts @@ -3,6 +3,8 @@ * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ +'use strict'; + import * as sqlops from 'sqlops'; import * as assert from 'assert'; import { Mock, It, Times } from 'typemoq'; @@ -11,7 +13,6 @@ import { MainThreadModelViewDialogShape, ExtHostModelViewShape } from 'sql/workb import { IMainContext } from 'vs/workbench/api/node/extHost.protocol'; import { MessageLevel } from 'sql/workbench/api/common/sqlExtHostTypes'; -'use strict'; suite('ExtHostModelViewDialog Tests', () => { let extHostModelViewDialog: ExtHostModelViewDialog; diff --git a/src/sqltest/workbench/api/mainThreadBackgroundTaskManagement.test.ts b/src/sqltest/workbench/api/mainThreadBackgroundTaskManagement.test.ts index 8a693005f4..68fc0238ca 100644 --- a/src/sqltest/workbench/api/mainThreadBackgroundTaskManagement.test.ts +++ b/src/sqltest/workbench/api/mainThreadBackgroundTaskManagement.test.ts @@ -3,17 +3,17 @@ * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ +'use strict'; + import * as sqlops from 'sqlops'; -import * as assert from 'assert'; import { Mock, It, Times } from 'typemoq'; import { MainThreadBackgroundTaskManagement, TaskStatus } from 'sql/workbench/api/node/mainThreadBackgroundTaskManagement'; import { ExtHostBackgroundTaskManagementShape } from 'sql/workbench/api/node/sqlExtHost.protocol'; -import { ITaskService } from 'sql/parts/taskHistory/common/taskService'; +import { ITaskService } from 'sql/platform/taskHistory/common/taskService'; import { IExtHostContext } from 'vs/workbench/api/node/extHost.protocol'; import { TaskNode } from 'sql/parts/taskHistory/common/taskNode'; -import { Event, Emitter } from 'vs/base/common/event'; +import { Emitter } from 'vs/base/common/event'; -'use strict'; suite('MainThreadBackgroundTaskManagement Tests', () => { let mainThreadBackgroundTaskManagement: MainThreadBackgroundTaskManagement; diff --git a/src/sqltest/workbench/api/mainThreadModelViewDialog.test.ts b/src/sqltest/workbench/api/mainThreadModelViewDialog.test.ts index cd13a915f9..6570572688 100644 --- a/src/sqltest/workbench/api/mainThreadModelViewDialog.test.ts +++ b/src/sqltest/workbench/api/mainThreadModelViewDialog.test.ts @@ -3,6 +3,8 @@ * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ +'use strict'; + import * as assert from 'assert'; import { Mock, It, Times } from 'typemoq'; import { MainThreadModelViewDialog } from 'sql/workbench/api/node/mainThreadModelViewDialog'; @@ -13,7 +15,6 @@ import { Dialog, DialogTab, Wizard } from 'sql/platform/dialog/dialogTypes'; import { ExtHostModelViewDialogShape } from 'sql/workbench/api/node/sqlExtHost.protocol'; import { Emitter } from 'vs/base/common/event'; -'use strict'; suite('MainThreadModelViewDialog Tests', () => { let mainThreadModelViewDialog: MainThreadModelViewDialog; diff --git a/src/sqltest/workbench/api/mainThreadNotebook.test.ts b/src/sqltest/workbench/api/mainThreadNotebook.test.ts index 4a15440614..9dfd58499b 100644 --- a/src/sqltest/workbench/api/mainThreadNotebook.test.ts +++ b/src/sqltest/workbench/api/mainThreadNotebook.test.ts @@ -14,10 +14,10 @@ import { IExtHostContext } from 'vs/workbench/api/node/extHost.protocol'; import { ExtHostNotebookShape } from 'sql/workbench/api/node/sqlExtHost.protocol'; import { MainThreadNotebook } from 'sql/workbench/api/node/mainThreadNotebook'; -import { NotebookService } from 'sql/services/notebook/notebookServiceImpl'; -import { INotebookProvider } from 'sql/services/notebook/notebookService'; +import { NotebookService } from 'sql/workbench/services/notebook/common/notebookServiceImpl'; +import { INotebookProvider } from 'sql/workbench/services/notebook/common/notebookService'; import { INotebookManagerDetails, INotebookSessionDetails, INotebookKernelDetails, INotebookFutureDetails } from 'sql/workbench/api/common/sqlExtHostTypes'; -import { LocalContentManager } from 'sql/services/notebook/localContentManager'; +import { LocalContentManager } from 'sql/workbench/services/notebook/node/localContentManager'; suite('MainThreadNotebook Tests', () => { @@ -91,7 +91,7 @@ suite('MainThreadNotebook Tests', () => { hasServerManager: false }; mockProxy.setup(p => p.$getNotebookManager(TypeMoq.It.isAnyNumber(), TypeMoq.It.isValue(notebookUri))) - .returns(() => Promise.resolve(details)); + .returns(() => Promise.resolve(details)); // When I get the notebook manager let manager = await provider.getNotebookManager(notebookUri); @@ -105,7 +105,7 @@ suite('MainThreadNotebook Tests', () => { test('should return manager with a content & server manager if extension host has these', async () => { // Given the extension provider doesn't have acontent or server manager mockProxy.setup(p => p.$getNotebookManager(TypeMoq.It.isAnyNumber(), TypeMoq.It.isValue(notebookUri))) - .returns(() => Promise.resolve(managerWithAllFeatures)); + .returns(() => Promise.resolve(managerWithAllFeatures)); // When I get the notebook manager let manager = await provider.getNotebookManager(notebookUri); diff --git a/src/sqltest/workbench/common/taskUtilities.test.ts b/src/sqltest/workbench/common/taskUtilities.test.ts index a65b6a6507..420bbb4a99 100644 --- a/src/sqltest/workbench/common/taskUtilities.test.ts +++ b/src/sqltest/workbench/common/taskUtilities.test.ts @@ -10,8 +10,8 @@ import * as TypeMoq from 'typemoq'; import * as TaskUtilities from 'sql/workbench/common/taskUtilities'; import { IObjectExplorerService } from 'sql/parts/objectExplorer/common/objectExplorerService'; import { TestConnectionManagementService } from 'sqltest/stubs/connectionManagementService.test'; -import { IConnectionProfile } from 'sql/parts/connection/common/interfaces'; -import { ConnectionProfile } from 'sql/parts/connection/common/connectionProfile'; +import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; +import { ConnectionProfile } from 'sql/platform/connection/common/connectionProfile'; import { WorkbenchEditorTestService } from 'sqltest/stubs/workbenchEditorTestService'; import URI from 'vs/base/common/uri'; import { UntitledEditorInput } from 'vs/workbench/common/editor/untitledEditorInput'; diff --git a/src/vs/workbench/browser/parts/editor/tabsTitleControl.ts b/src/vs/workbench/browser/parts/editor/tabsTitleControl.ts index 85bde7ce9e..f8b07d22bb 100644 --- a/src/vs/workbench/browser/parts/editor/tabsTitleControl.ts +++ b/src/vs/workbench/browser/parts/editor/tabsTitleControl.ts @@ -48,7 +48,7 @@ import * as QueryConstants from 'sql/parts/query/common/constants'; import * as WorkbenchUtils from 'sql/workbench/common/sqlWorkbenchUtils'; // {{SQL CARBON EDIT}} -- Display the editor's tab color -import { IConnectionManagementService } from 'sql/parts/connection/common/connectionManagement'; +import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement'; import { IQueryEditorService } from 'sql/parts/query/common/queryEditorService'; import { IObjectExplorerService } from 'sql/parts/objectExplorer/common/objectExplorerService'; import { ICommandService } from 'vs/platform/commands/common/commands'; diff --git a/src/vs/workbench/electron-browser/workbench.ts b/src/vs/workbench/electron-browser/workbench.ts index e8b49d4f42..36bcb215fa 100644 --- a/src/vs/workbench/electron-browser/workbench.ts +++ b/src/vs/workbench/electron-browser/workbench.ts @@ -114,60 +114,66 @@ import { EditorService } from 'vs/workbench/services/editor/browser/editorServic import { IExtensionUrlHandler, ExtensionUrlHandler } from 'vs/platform/url/electron-browser/inactiveExtensionUrlHandler'; // {{SQL CARBON EDIT}} -import { IConnectionManagementService, IConnectionDialogService, IErrorMessageService, IServerGroupController } from 'sql/parts/connection/common/connectionManagement'; -import { ConnectionManagementService } from 'sql/parts/connection/common/connectionManagementService'; +import { IConnectionManagementService, IConnectionDialogService } from 'sql/platform/connection/common/connectionManagement'; +import { ConnectionManagementService } from 'sql/platform/connection/common/connectionManagementService'; import { ConnectionDialogService } from 'sql/parts/connection/connectionDialog/connectionDialogService'; -import { ErrorMessageService } from 'sql/workbench/errorMessageDialog/errorMessageService'; -import { ServerGroupController } from 'sql/parts/objectExplorer/serverGroupDialog/serverGroupController'; - -import { IAngularEventingService, AngularEventingService } from 'sql/services/angularEventing/angularEventingService'; -import { ICapabilitiesService, CapabilitiesService } from 'sql/services/capabilities/capabilitiesService'; -import { ICredentialsService, CredentialsService } from 'sql/services/credentials/credentialsService'; -import { ISerializationService, SerializationService } from 'sql/services/serialization/serializationService'; -import { IMetadataService, MetadataService } from 'sql/services/metadata/metadataService'; +import { IErrorMessageService } from 'sql/platform/errorMessage/common/errorMessageService'; +import { ErrorMessageService } from 'sql/workbench/services/errorMessage/browser/errorMessageService'; +import { ServerGroupController } from 'sql/workbench/services/serverGroup/browser/serverGroupController'; +import { IServerGroupController } from 'sql/platform/serverGroup/common/serverGroupController'; +import { IAngularEventingService } from 'sql/platform/angularEventing/common/angularEventingService'; +import { AngularEventingService } from 'sql/platform/angularEventing/node/angularEventingService'; +import { ICapabilitiesService, CapabilitiesService } from 'sql/platform/capabilities/common/capabilitiesService'; +import { ICredentialsService, CredentialsService } from 'sql/platform/credentials/common/credentialsService'; +import { ISerializationService, SerializationService } from 'sql/platform/serialization/common/serializationService'; +import { IMetadataService, MetadataService } from 'sql/platform/metadata/common/metadataService'; import { IObjectExplorerService, ObjectExplorerService } from 'sql/parts/objectExplorer/common/objectExplorerService'; -import { ITaskService, TaskService } from 'sql/parts/taskHistory/common/taskService'; -import { IQueryModelService } from 'sql/parts/query/execution/queryModel'; -import { QueryModelService } from 'sql/parts/query/execution/queryModelService'; +import { ITaskService, TaskService } from 'sql/platform/taskHistory/common/taskService'; +import { IQueryModelService } from 'sql/platform/query/common/queryModel'; +import { QueryModelService } from 'sql/platform/query/common/queryModelService'; import { IQueryEditorService } from 'sql/parts/query/common/queryEditorService'; import { QueryEditorService } from 'sql/parts/query/services/queryEditorService'; -import { IQueryManagementService, QueryManagementService } from 'sql/parts/query/common/queryManagement'; +import { IQueryManagementService, QueryManagementService } from 'sql/platform/query/common/queryManagement'; import { IEditorDescriptorService, EditorDescriptorService } from 'sql/parts/query/editor/editorDescriptorService'; -import { IScriptingService, ScriptingService } from 'sql/services/scripting/scriptingService'; -import { IAdminService, AdminService } from 'sql/parts/admin/common/adminService'; -import { IJobManagementService } from 'sql/parts/jobManagement/common/interfaces'; -import { JobManagementService } from 'sql/parts/jobManagement/common/jobManagementService'; -import { IDacFxService, DacFxService } from 'sql/services/dacfx/dacFxService'; -import { IBackupService, IBackupUiService } from 'sql/parts/disasterRecovery/backup/common/backupService'; -import { BackupService, BackupUiService } from 'sql/parts/disasterRecovery/backup/common/backupServiceImp'; -import { IRestoreDialogController, IRestoreService } from 'sql/parts/disasterRecovery/restore/common/restoreService'; -import { RestoreService, RestoreDialogController } from 'sql/parts/disasterRecovery/restore/common/restoreServiceImpl'; +import { IScriptingService, ScriptingService } from 'sql/platform/scripting/common/scriptingService'; +import { IAdminService, AdminService } from 'sql/workbench/services/admin/common/adminService'; +import { IJobManagementService } from 'sql/platform/jobManagement/common/interfaces'; +import { JobManagementService } from 'sql/platform/jobManagement/common/jobManagementService'; +import { IDacFxService, DacFxService } from 'sql/platform/dacfx/common/dacFxService'; +import { IBackupService, IBackupUiService } from 'sql/platform/backup/common/backupService'; +import { BackupService } from 'sql/platform/backup/common/backupServiceImp'; +import { BackupUiService } from 'sql/workbench/parts/backup/browser/backupUiService'; +import { IRestoreDialogController, IRestoreService } from 'sql/platform/restore/common/restoreService'; +import { RestoreService, RestoreDialogController } from 'sql/platform/restore/common/restoreServiceImpl'; import { INewDashboardTabDialogService } from 'sql/parts/dashboard/newDashboardTabDialog/interface'; import { NewDashboardTabDialogService } from 'sql/parts/dashboard/newDashboardTabDialog/newDashboardTabDialogService'; -import { IFileBrowserService, IFileBrowserDialogController } from 'sql/parts/fileBrowser/common/interfaces'; -import { FileBrowserService } from 'sql/parts/fileBrowser/common/fileBrowserService'; +import { IFileBrowserService, IFileBrowserDialogController } from 'sql/platform/fileBrowser/common/interfaces'; +import { FileBrowserService } from 'sql/platform/fileBrowser/common/fileBrowserService'; import { FileBrowserDialogController } from 'sql/parts/fileBrowser/fileBrowserDialogController'; import { IInsightsDialogService } from 'sql/parts/insights/common/interfaces'; import { InsightsDialogService } from 'sql/parts/insights/insightsDialogService'; -import { IAccountManagementService } from 'sql/services/accountManagement/interfaces'; -import { AccountManagementService } from 'sql/services/accountManagement/accountManagementService'; -import { IProfilerService } from 'sql/parts/profiler/service/interfaces'; -import { ProfilerService } from 'sql/parts/profiler/service/profilerService'; -import { ISqlOAuthService } from 'sql/common/sqlOAuthService'; -import { SqlOAuthService } from 'sql/common/browser/sqlOAuthServiceImpl'; +import { IAccountManagementService } from 'sql/platform/accountManagement/common/interfaces'; +import { AccountManagementService } from 'sql/workbench/services/accountManagement/browser/accountManagementService'; +import { IProfilerService } from 'sql/workbench/services/profiler/common/interfaces'; +import { ProfilerService } from 'sql/workbench/services/profiler/common/profilerService'; +import { ISqlOAuthService } from 'sql/platform/oAuth/common/sqlOAuthService'; +import { SqlOAuthService } from 'sql/platform/oAuth/electron-browser/sqlOAuthServiceImpl'; import { IClipboardService as sqlIClipboardService } from 'sql/platform/clipboard/common/clipboardService'; import { ClipboardService as sqlClipboardService } from 'sql/platform/clipboard/electron-browser/clipboardService'; -import { IResourceProviderService, IAccountPickerService } from 'sql/parts/accountManagement/common/interfaces'; -import { ResourceProviderService } from 'sql/parts/accountManagement/common/resourceProviderService'; -import { AccountPickerService } from 'sql/parts/accountManagement/accountPicker/accountPickerService'; -import { IDashboardViewService } from 'sql/services/dashboard/common/dashboardViewService'; -import { IModelViewService } from 'sql/services/modelComponents/modelViewService'; -import { DashboardViewService } from 'sql/services/dashboard/common/dashboardViewServiceImpl'; -import { ModelViewService } from 'sql/services/modelComponents/modelViewServiceImpl'; -import { IDashboardService } from 'sql/services/dashboard/common/dashboardService'; -import { DashboardService } from 'sql/services/dashboard/common/dashboardServiceImpl'; -import { NotebookService } from 'sql/services/notebook/notebookServiceImpl'; -import { INotebookService } from 'sql/services/notebook/notebookService'; +import { AccountPickerService } from 'sql/platform/accountManagement/browser/accountPickerService'; +import { IAccountPickerService } from 'sql/platform/accountManagement/common/accountPicker'; +import { IResourceProviderService } from 'sql/workbench/services/resourceProvider/common/resourceProviderService'; +import { ResourceProviderService } from 'sql/workbench/services/resourceProvider/browser/resourceProviderService'; +import { IDashboardViewService } from 'sql/platform/dashboard/common/dashboardViewService'; +import { DashboardViewService } from 'sql/platform/dashboard/common/dashboardViewServiceImpl'; +import { IModelViewService } from 'sql/platform/modelComponents/common/modelViewService'; +import { ModelViewService } from 'sql/platform/modelComponents/common/modelViewServiceImpl'; +import { IDashboardService } from 'sql/platform/dashboard/browser/dashboardService'; +import { DashboardService } from 'sql/platform/dashboard/browser/dashboardServiceImpl'; +import { NotebookService } from 'sql/workbench/services/notebook/common/notebookServiceImpl'; +import { INotebookService } from 'sql/workbench/services/notebook/common/notebookService'; +import { ICommandLineProcessing } from 'sql/workbench/services/commandLine/common/commandLine'; +import { CommandLineService } from 'sql/workbench/services/commandLine/common/commandLineService'; import { ContextViewService } from 'vs/platform/contextview/browser/contextViewService'; import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry'; @@ -175,10 +181,6 @@ import { TelemetryService } from 'vs/platform/telemetry/common/telemetryService' import { WorkbenchThemeService } from 'vs/workbench/services/themes/electron-browser/workbenchThemeService'; import { IWorkbenchThemeService } from 'vs/workbench/services/themes/common/workbenchThemeService'; import { IUriDisplayService, UriDisplayService } from 'vs/platform/uriDisplay/common/uriDisplay'; -// {{SQL CARBON EDIT}} -import { ICommandLineProcessing } from 'sql/parts/commandLine/common/commandLine'; -import { CommandLineService } from 'sql/parts/commandLine/common/commandLineService'; -// {{SQL CARBON EDIT}} interface WorkbenchParams { configuration: IWindowConfiguration; diff --git a/src/vs/workbench/parts/files/electron-browser/fileActions.ts b/src/vs/workbench/parts/files/electron-browser/fileActions.ts index 2ee75932b5..152eefd6c3 100644 --- a/src/vs/workbench/parts/files/electron-browser/fileActions.ts +++ b/src/vs/workbench/parts/files/electron-browser/fileActions.ts @@ -53,7 +53,7 @@ import { Constants } from 'vs/editor/common/core/uint'; import { CLOSE_EDITORS_AND_GROUP_COMMAND_ID } from 'vs/workbench/browser/parts/editor/editorCommands'; // {{SQL CARBON EDIT}} -import { IConnectionManagementService } from 'sql/parts/connection/common/connectionManagement'; +import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement'; import { IObjectExplorerService } from 'sql/parts/objectExplorer/common/objectExplorerService'; import { IQueryEditorService } from 'sql/parts/query/common/queryEditorService'; import * as TaskUtilities from 'sql/workbench/common/taskUtilities'; diff --git a/src/vs/workbench/workbench.main.ts b/src/vs/workbench/workbench.main.ts index 8e4307b613..0265b969be 100644 --- a/src/vs/workbench/workbench.main.ts +++ b/src/vs/workbench/workbench.main.ts @@ -157,7 +157,7 @@ import 'sql/parts/taskHistory/common/taskHistory.contribution'; import 'sql/parts/taskHistory/viewlet/taskHistoryViewlet'; import 'sql/parts/tasks/common/tasks.contribution'; import 'sql/parts/objectExplorer/common/registeredServer.contribution'; -import 'sql/parts/objectExplorer/viewlet/connectionViewlet'; +import 'sql/workbench/parts/connection/electron-browser/connectionViewlet'; import 'sql/workbench/api/node/sqlExtHost.contribution'; import 'sql/parts/connection/common/connection.contribution'; import 'sql/parts/query/common/query.contribution';