ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-21 18:47:00 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix for dragged table name (#11376) (#11385)

Browse Source 
* fix for dragged table name

* escaped bracket characters

* fixed escaping brackets

* moved outer brackets

* using interpolated strings

Co-authored-by: Christopher Suh <chsuh@microsoft.com>
This commit is contained in:
Alan Ren
2020-07-16 15:15:52 -07:00
committed by GitHub
parent 09915fe557
commit fe63123066
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/sql/workbench/services/objectExplorer/browser/dragAndDropController.ts
View File

@@ -74,9 +74,10 @@ export class ServerTreeDragAndDrop implements IDragAndDrop {
const data = dragAndDropData.getData();
const element = data[0];
if (element.nodeTypeId === 'Column' || element.nodeTypeId === 'Table') {
const schema = element.metadata.schema;
const name = element.metadata.name;
originalEvent.dataTransfer.setData(DataTransfers.RESOURCES, JSON.stringify([`${element.nodeTypeId}:${element.id}?${schema ? schema + '.' + name : name}`]));
const escapedSchema = element.metadata.schema?.replace(/]/g, ']]');
const escapedName = element.metadata.name?.replace(/]/g, ']]');
const finalString = escapedSchema ? `[${escapedSchema}].[${escapedName}]` : `[${escapedName}]`;
originalEvent.dataTransfer.setData(DataTransfers.RESOURCES, JSON.stringify([`${element.nodeTypeId}:${element.id}?${finalString}`]));
}
return;
}

2
src/vs/workbench/browser/parts/editor/editorDropTarget.ts
View File

@@ -360,7 +360,7 @@ class DropOverlay extends Themable {
// {{SQL CARBON EDIT}}
const editor = this.editorService.activeTextEditorControl as ICodeEditor;
if (untitledOrFileResources[0].resource.scheme === 'Column' || untitledOrFileResources[0].resource.scheme === 'Table') {
SnippetController2.get(editor).insert(`[${untitledOrFileResources[0].resource.query}]`);
SnippetController2.get(editor).insert(untitledOrFileResources[0].resource.query);
return;
}