From 6410aae5903a67f025f1a79d4de8817cd255880b Mon Sep 17 00:00:00 2001
From: Ansgar Becker <ansgarbecker@users.noreply.github.com>
Date: Sun, 7 Feb 2010 11:32:24 +0000
Subject: [PATCH] Also quote column names when doubleclicking or dragging from
 a query helpers column list. Fixes issue #1666.

---
 source/main.pas | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/source/main.pas b/source/main.pas
index 0cd59767..110e0e7f 100644
--- a/source/main.pas
+++ b/source/main.pas
@@ -4474,7 +4474,7 @@ procedure TMainForm.SynMemoQueryDragDrop(Sender, Source: TObject; X,
   Y: Integer);
 var
   src : TControl;
-  Text : String;
+  Text, ItemText: String;
   LoadText : Boolean;
   i: Integer;
   TreeNode: PVirtualNode;
@@ -4500,8 +4500,12 @@ begin
     end else begin
       Text := '';
       for i := 0 to ActiveQueryHelpers.Items.Count - 1 do begin
-        if ActiveQueryHelpers.Selected[i] then
-          Text := Text + ActiveQueryHelpers.Items[i] + ', ';
+        if ActiveQueryHelpers.Selected[i] then begin
+          ItemText := ActiveQueryHelpers.Items[i];
+          if tabsetQueryHelpers.TabIndex = 0 then
+            ItemText := mask(ItemText); // Quote column names
+          Text := Text + ItemText + ', ';
+        end;
       end;
       Delete(Text, Length(Text)-1, 2);
     end;
@@ -5165,7 +5169,7 @@ end;
 }
 procedure TMainForm.lboxQueryHelpersDblClick(Sender: TObject);
 var
-  text: String;
+  Text, ItemText: String;
   i: Integer;
 begin
   if ActiveQueryTabset.TabIndex = 3 then begin
@@ -5175,11 +5179,15 @@ begin
   end else begin
     // For all other tabs just insert selected list item(s)
     for i := 0 to ActiveQueryHelpers.Items.Count - 1 do begin
-      if ActiveQueryHelpers.Selected[i] then
-        text := text + ActiveQueryHelpers.Items[i] + ', ';
+      if not ActiveQueryHelpers.Selected[i] then
+        continue;
+      ItemText := ActiveQueryHelpers.Items[i];
+      if tabsetQueryHelpers.TabIndex = 0 then
+        ItemText := mask(ItemText); // Quote column names
+      Text := Text + ItemText + ', ';
     end;
-    Delete(text, Length(text)-1, 2);
-    ActiveQueryMemo.SelText := text;
+    Delete(text, Length(Text)-1, 2);
+    ActiveQueryMemo.SelText := Text;
   end;
   ActiveQueryMemo.SetFocus;
 end;