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

Author: dpage
Date: 2005-12-02 10:02:32 +0000 (Fri, 02 Dec 2005)
New Revision: 4783

Modified:
   branches/REL-1_4_0_PATCHES/pgadmin3/CHANGELOG.txt
   branches/REL-1_4_0_PATCHES/pgadmin3/src/dlg/dlgTable.cpp
Log:
Drop constraints on columns before the columns themselves [Miha Radej]


Modified: branches/REL-1_4_0_PATCHES/pgadmin3/CHANGELOG.txt
===================================================================
--- branches/REL-1_4_0_PATCHES/pgadmin3/CHANGELOG.txt    2005-12-02 09:36:59 UTC (rev 4782)
+++ branches/REL-1_4_0_PATCHES/pgadmin3/CHANGELOG.txt    2005-12-02 10:02:32 UTC (rev 4783)
@@ -18,6 +18,8 @@
 </ul>
 <br>
 <ul>
+    <li>2005-12-02 DP  1.4.1  Drop constraints on columns before the columns themselves [Miha Radej]
+    <li>2005-12-01 AP  1.4.1  Deal with incompatible wx2.6.2 API changes (comboboxes)
     <li>2005-11-25 DP  1.4.1  Fix the server status SQL query
     <li>2005-11-25 FGP 1.4.1  Include pg_dump/pg_restore in the Mac OSX bundle
     <li>2005-11-20 DP  1.4.1  Use a proper 'Save As' style dialogue for selecting backup files

Modified: branches/REL-1_4_0_PATCHES/pgadmin3/src/dlg/dlgTable.cpp
===================================================================
--- branches/REL-1_4_0_PATCHES/pgadmin3/src/dlg/dlgTable.cpp    2005-12-02 09:36:59 UTC (rev 4782)
+++ branches/REL-1_4_0_PATCHES/pgadmin3/src/dlg/dlgTable.cpp    2005-12-02 10:02:32 UTC (rev 4783)
@@ -513,8 +513,9 @@
                 definition = definition.Mid(1).BeforeFirst('"');
             else
                 definition = definition.BeforeFirst(' ');
-            sql += wxT("ALTER TABLE ") + tabname
-                +  wxT(" DROP CONSTRAINT ") + qtIdent(definition) + wxT(";\n");
+                sql = wxT("ALTER TABLE ") + tabname
+                    + wxT(" DROP CONSTRAINT ") + qtIdent(definition) + wxT(";\n")
+                    + sql;
         }
         // Add the ADD CONSTRAINTs...
         sql += tmpsql;