ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-03 01:25:38 -05:00
Code Issues Packages Projects Releases Wiki Activity

Move around scripting utils (#7523)

Browse Source 
* Move around scripting utils

* Don't set a file path

* Version bump
This commit is contained in:
Amir Omidi
2019-10-07 15:09:49 -07:00
committed by GitHub
parent 3fb4877859
commit 285f8bc28c
9 changed files with 12 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/sql/workbench/electron-browser/scriptingActions.ts → src/sql/workbench/browser/scriptingActions.ts
View File

@@ -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 {

15
src/sql/workbench/electron-browser/scriptingUtils.ts → src/sql/workbench/browser/scriptingUtils.ts
View File

@@ -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`);
}
}

2
src/sql/workbench/parts/dashboard/electron-browser/widgets/explorer/explorerTreeActions.ts
View File

@@ -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';

2
src/sql/workbench/parts/dashboard/electron-browser/widgets/explorer/explorerWidget.contribution.ts
View File

@@ -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);

2
src/sql/workbench/parts/scripting/electron-browser/scripting.contribution.ts → src/sql/workbench/parts/scripting/browser/scripting.contribution.ts
View File

@@ -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';

2
src/sql/workbench/parts/scripting/electron-browser/scriptingActions.ts → src/sql/workbench/parts/scripting/browser/scriptingActions.ts
View File

@@ -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';