diff --git a/extensions/mssql/config.json b/extensions/mssql/config.json index 79854018c0..d39fce9ce5 100644 --- a/extensions/mssql/config.json +++ b/extensions/mssql/config.json @@ -1,6 +1,6 @@ { "downloadUrl": "https://github.com/Microsoft/sqltoolsservice/releases/download/v{#version#}/microsoft.sqltools.servicelayer-{#fileName#}", - "version": "2.0.0-release.18", + "version": "2.0.0-release.21", "downloadFileNames": { "Windows_86": "win-x86-netcoreapp2.2.zip", "Windows_64": "win-x64-netcoreapp2.2.zip", diff --git a/src/sql/workbench/electron-browser/scriptingActions.ts b/src/sql/workbench/browser/scriptingActions.ts similarity index 99% rename from src/sql/workbench/electron-browser/scriptingActions.ts rename to src/sql/workbench/browser/scriptingActions.ts index 5ea57fe749..42d0066c5d 100644 --- a/src/sql/workbench/electron-browser/scriptingActions.ts +++ b/src/sql/workbench/browser/scriptingActions.ts @@ -9,7 +9,7 @@ import { IQueryEditorService } from 'sql/workbench/services/queryEditor/common/q import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement'; import { IScriptingService, ScriptOperation } from 'sql/platform/scripting/common/scriptingService'; import { BaseActionContext } from 'sql/workbench/browser/actions'; -import { scriptSelect, script, scriptEditSelect } from 'sql/workbench/electron-browser/scriptingUtils'; +import { scriptSelect, script, scriptEditSelect } from 'sql/workbench/browser/scriptingUtils'; import { IErrorMessageService } from 'sql/platform/errorMessage/common/errorMessageService'; export class ScriptSelectAction extends Action { diff --git a/src/sql/workbench/electron-browser/scriptingUtils.ts b/src/sql/workbench/browser/scriptingUtils.ts similarity index 95% rename from src/sql/workbench/electron-browser/scriptingUtils.ts rename to src/sql/workbench/browser/scriptingUtils.ts index fd90d0cc49..a7ffcaf798 100644 --- a/src/sql/workbench/electron-browser/scriptingUtils.ts +++ b/src/sql/workbench/browser/scriptingUtils.ts @@ -4,8 +4,6 @@ *--------------------------------------------------------------------------------------------*/ import * as azdata from 'azdata'; -import * as path from 'vs/base/common/path'; -import * as os from 'os'; import { IConnectionManagementService, IConnectionCompletionOptions, ConnectionType, IConnectableInput, RunQueryOnConnectionMode } from 'sql/platform/connection/common/connectionManagement'; import { ConnectionManagementInfo } from 'sql/platform/connection/common/connectionManagementInfo'; import * as nls from 'vs/nls'; @@ -193,7 +191,7 @@ export function script(connectionProfile: IConnectionProfile, metadata: azdata.O function getScriptingParamDetails(connectionService: IConnectionManagementService, ownerUri: string, metadata: azdata.ObjectMetadata): azdata.ScriptingParamDetails { let serverInfo: azdata.ServerInfo = getServerInfo(connectionService, ownerUri); let paramDetails: azdata.ScriptingParamDetails = { - filePath: getFilePath(metadata), + filePath: undefined, scriptCompatibilityOption: scriptCompatibilityOptionMap[serverInfo.serverMajorVersion], targetDatabaseEngineEdition: targetDatabaseEngineEditionMap[serverInfo.engineEditionId], targetDatabaseEngineType: serverInfo.isCloud ? 'SqlAzure' : 'SingleInstance' @@ -205,14 +203,3 @@ function getServerInfo(connectionService: IConnectionManagementService, ownerUri let connection: ConnectionManagementInfo = connectionService.getConnectionInfo(ownerUri); return connection.serverInfo; } - -function getFilePath(metadata: azdata.ObjectMetadata): string { - let schemaName: string = metadata.schema; - let objectName: string = metadata.name; - let timestamp = Date.now().toString(); - if (schemaName !== null) { - return path.join(os.tmpdir(), `${schemaName}.${objectName}_${timestamp}.txt`); - } else { - return path.join(os.tmpdir(), `${objectName}_${timestamp}.txt`); - } -} diff --git a/src/sql/workbench/parts/dashboard/electron-browser/widgets/explorer/explorerTreeActions.ts b/src/sql/workbench/parts/dashboard/electron-browser/widgets/explorer/explorerTreeActions.ts index 8ae0b9bb25..0f9bb12fd6 100644 --- a/src/sql/workbench/parts/dashboard/electron-browser/widgets/explorer/explorerTreeActions.ts +++ b/src/sql/workbench/parts/dashboard/electron-browser/widgets/explorer/explorerTreeActions.ts @@ -3,7 +3,7 @@ * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { ScriptSelectAction, ScriptCreateAction, ScriptAlterAction, ScriptExecuteAction } from 'sql/workbench/electron-browser/scriptingActions'; +import { ScriptSelectAction, ScriptCreateAction, ScriptAlterAction, ScriptExecuteAction } from 'sql/workbench/browser/scriptingActions'; import { IQueryEditorService } from 'sql/workbench/services/queryEditor/common/queryEditorService'; import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement'; import { IScriptingService } from 'sql/platform/scripting/common/scriptingService'; diff --git a/src/sql/workbench/parts/dashboard/electron-browser/widgets/explorer/explorerWidget.contribution.ts b/src/sql/workbench/parts/dashboard/electron-browser/widgets/explorer/explorerWidget.contribution.ts index 1fc5ad098c..e411fb7fa2 100644 --- a/src/sql/workbench/parts/dashboard/electron-browser/widgets/explorer/explorerWidget.contribution.ts +++ b/src/sql/workbench/parts/dashboard/electron-browser/widgets/explorer/explorerWidget.contribution.ts @@ -9,7 +9,7 @@ import { ExplorerScriptSelectAction, ExplorerScriptExecuteAction, ExplorerScript import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; import { ItemContextKey } from 'sql/workbench/parts/dashboard/browser/widgets/explorer/explorerTreeContext'; import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey'; -import { EditDataAction } from 'sql/workbench/electron-browser/scriptingActions'; +import { EditDataAction } from 'sql/workbench/browser/scriptingActions'; CommandsRegistry.registerCommand(ExplorerScriptSelectAction.ID, (accessor, context) => { const instantiationService = accessor.get(IInstantiationService); diff --git a/src/sql/workbench/parts/scripting/electron-browser/scripting.contribution.ts b/src/sql/workbench/parts/scripting/browser/scripting.contribution.ts similarity index 98% rename from src/sql/workbench/parts/scripting/electron-browser/scripting.contribution.ts rename to src/sql/workbench/parts/scripting/browser/scripting.contribution.ts index a4defeaa0d..f0af4d127d 100644 --- a/src/sql/workbench/parts/scripting/electron-browser/scripting.contribution.ts +++ b/src/sql/workbench/parts/scripting/browser/scripting.contribution.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import { MenuId, MenuRegistry } from 'vs/platform/actions/common/actions'; -import * as commands from 'sql/workbench/parts/scripting/electron-browser/scriptingActions'; +import * as commands from 'sql/workbench/parts/scripting/browser/scriptingActions'; import { MssqlNodeContext } from 'sql/workbench/parts/dataExplorer/browser/mssqlNodeContext'; import { localize } from 'vs/nls'; import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey'; diff --git a/src/sql/workbench/parts/scripting/electron-browser/scriptingActions.ts b/src/sql/workbench/parts/scripting/browser/scriptingActions.ts similarity index 99% rename from src/sql/workbench/parts/scripting/electron-browser/scriptingActions.ts rename to src/sql/workbench/parts/scripting/browser/scriptingActions.ts index e3c3e01131..1862ba76ed 100644 --- a/src/sql/workbench/parts/scripting/electron-browser/scriptingActions.ts +++ b/src/sql/workbench/parts/scripting/browser/scriptingActions.ts @@ -14,7 +14,7 @@ import { IConnectionManagementService } from 'sql/platform/connection/common/con import { IProgressService } from 'vs/platform/progress/common/progress'; import { BaseActionContext } from 'sql/workbench/browser/actions'; import { ConnectionProfile } from 'sql/platform/connection/common/connectionProfile'; -import { ScriptCreateAction, ScriptDeleteAction, ScriptSelectAction, ScriptExecuteAction, ScriptAlterAction, EditDataAction } from 'sql/workbench/electron-browser/scriptingActions'; +import { ScriptCreateAction, ScriptDeleteAction, ScriptSelectAction, ScriptExecuteAction, ScriptAlterAction, EditDataAction } from 'sql/workbench/browser/scriptingActions'; import { ObjectExplorerActionsContext, getTreeNode } from 'sql/workbench/parts/objectExplorer/browser/objectExplorerActions'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; import { IObjectExplorerService } from 'sql/workbench/services/objectExplorer/browser/objectExplorerService'; diff --git a/src/vs/workbench/workbench.common.main.ts b/src/vs/workbench/workbench.common.main.ts index 6e73cf72f1..c9cf85ef0d 100644 --- a/src/vs/workbench/workbench.common.main.ts +++ b/src/vs/workbench/workbench.common.main.ts @@ -432,4 +432,7 @@ import 'sql/workbench/parts/backup/browser/backup.contribution'; //restore import 'sql/workbench/parts/restore/browser/restore.contribution'; +// Scripting +import 'sql/workbench/parts/scripting/browser/scripting.contribution'; + //#endregion diff --git a/src/vs/workbench/workbench.desktop.main.ts b/src/vs/workbench/workbench.desktop.main.ts index cb25874632..0f6f9220a6 100644 --- a/src/vs/workbench/workbench.desktop.main.ts +++ b/src/vs/workbench/workbench.desktop.main.ts @@ -155,14 +155,13 @@ import { registerSingleton } from 'vs/platform/instantiation/common/extensions'; //#endregion // {{SQL CARBON EDIT}} +// release notes import 'sql/workbench/update/electron-browser/releaseNotes.contribution'; -// Scripting -import 'sql/workbench/parts/scripting/electron-browser/scripting.contribution'; - // query history import 'sql/workbench/parts/queryHistory/electron-browser/queryHistory.contribution'; +// CLI import 'sql/workbench/parts/commandLine/electron-browser/commandLine.contribution'; //getting started