Thread: SVN Commit by dpage: r4882 - in branches/REL-1_4_0_PATCHES/pgadmin3: . src/ctl

Author: dpage
Date: 2006-01-09 09:22:29 +0000 (Mon, 09 Jan 2006)
New Revision: 4882

Modified:
   branches/REL-1_4_0_PATCHES/pgadmin3/CHANGELOG.txt
   branches/REL-1_4_0_PATCHES/pgadmin3/src/ctl/ctlSQLResult.cpp
Log:
Honour the copy quoting setting properly in the SQL results pane [Magnus Hagander]

Modified: branches/REL-1_4_0_PATCHES/pgadmin3/CHANGELOG.txt
===================================================================
--- branches/REL-1_4_0_PATCHES/pgadmin3/CHANGELOG.txt    2006-01-09 09:11:33 UTC (rev 4881)
+++ branches/REL-1_4_0_PATCHES/pgadmin3/CHANGELOG.txt    2006-01-09 09:22:29 UTC (rev 4882)
@@ -18,6 +18,7 @@
 </ul>
 <br>
 <ul>
+    <li>2006-01-09 DP  1.4.2  Honour the copy quoting setting properly in the SQL results pane [Magnus Hagander]
     <li>2006-01-09 DP  1.4.2  Set the initial Unicode/Local charset options correctly in the Export dialogue [Magnus
Hagander]
     <li>2005-12-26 AP  1.4.2  Fix PK detection in EditGrid per Andrus Moor
     <li>2005-12-26 AP  1.4.2  Fix Bitmap Index explain per Alexander Kirpa

Modified: branches/REL-1_4_0_PATCHES/pgadmin3/src/ctl/ctlSQLResult.cpp
===================================================================
--- branches/REL-1_4_0_PATCHES/pgadmin3/src/ctl/ctlSQLResult.cpp    2006-01-09 09:11:33 UTC (rev 4881)
+++ branches/REL-1_4_0_PATCHES/pgadmin3/src/ctl/ctlSQLResult.cpp    2006-01-09 09:22:29 UTC (rev 4882)
@@ -72,19 +72,25 @@

         wxString text=GetItemText(row, col);

-        bool needQuote=(settings->GetExportQuoting() > 1);
+        bool needQuote  = false;
+        if (settings->GetExportQuoting() == 1)
+        {
+            /* Quote strings only */
+            switch (colTypClasses.Item(col))
+            {
+            case PGTYPCLASS_NUMERIC:
+            case PGTYPCLASS_BOOL:
+                break;
+            default:
+                needQuote=true;
+                break;
+            }
+        }
+        else if (settings->GetExportQuoting() == 2)
+            /* Quote everything */
+            needQuote = true;

-
-        switch (colTypClasses.Item(col))
-        {
-            case PGTYPCLASS_NUMERIC:
-            case PGTYPCLASS_BOOL:
-                break;
-            default:
-                needQuote=true;
-                break;
-        }
-        if (needQuote)
+        if (needQuote)
             str.Append(settings->GetExportQuoteChar());
         str.Append(text);
         if (needQuote)