Thread: SVN Commit by dpage: r4784 - in trunk/pgadmin3: . src/dlg

SVN Commit by dpage: r4784 - in trunk/pgadmin3: . src/dlg

From
svn@pgadmin.org
Date:
Author: dpage
Date: 2005-12-02 10:06:55 +0000 (Fri, 02 Dec 2005)
New Revision: 4784

Modified:
   trunk/pgadmin3/CHANGELOG.txt
   trunk/pgadmin3/src/dlg/dlgTable.cpp
Log:
Drop constraints on columns before the columns themselves [Miha Radej]


Modified: trunk/pgadmin3/CHANGELOG.txt
===================================================================
--- trunk/pgadmin3/CHANGELOG.txt    2005-12-02 10:02:32 UTC (rev 4783)
+++ trunk/pgadmin3/CHANGELOG.txt    2005-12-02 10:06:55 UTC (rev 4784)
@@ -18,7 +18,8 @@
 </ul>
 <br>
 <ul>
-    <li>2005-12-01 AP  1.4.1  Deal with incompatible wx2.6.2 API changes (group combobox in security panel)
+    <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-30 AP         Graphical explain: distinct scan images
     <li>2005-11-25 DP  1.4.1  Fix the server status SQL query
     <li>2005-11-25 FGP 1.4.1  Don't include pgAgent in the Mac OSX bundle
@@ -26,8 +27,10 @@
     <li>2005-11-20 DP  1.4.1  Use a proper 'Save As' style dialogue for selecting backup files
     <li>2005-11-20 AP  1.4.1  Don't show pk hint when editing view
     <li>2005-11-20 AP  1.4.1  Add missing NO ACTION FK constraint
+    <li>2005-11-11 DP         Set version numbers whereever required from version.h during bootstrap
     <li>2005-11-11 AP         leave pre-1.5 server config settings untouched
     <li>2005-11-10 AP         Configurable indent in ctlSqlBox
+    <li>2005-11-10 DP         Ensure we always use aclocal/automake 1.9 during bootstrap
     <li>2005-11-10 AP  1.4.1  Fix role rename (r: Antonio)
     <li>2005-11-09 AP         database and schema display restriction
     <li>2005-11-09 AP         overhaul of server config settings
@@ -35,6 +38,7 @@
     <li>2005-11-09 AP  1.4.1  Allow all 8.x column changes (r: Chris Velevitch)
     <li>2005-11-09 DP         Add search/replace to the query editor
     <li>2005-11-09 AP  1.4.1  Fix param name quoting for procedures (r: Alex Tyagloff)
+    <li>2005-11-10 DP         Overhaul the autoconf stuff. Make full use of pg_config/wx-config.
     <li>2005-11-04 AP  1.4.0  Fix SET role (r:Florian Pflug), fix role help
     <li>2005-11-04 DP  1.4.0  Fix role inheritance option when creating roles, per Mike Allen
     <li>2005-11-03 DP  1.4.0  Minor fix to the pgAgent command line parser, per Harald Armin Massa

Modified: trunk/pgadmin3/src/dlg/dlgTable.cpp
===================================================================
--- trunk/pgadmin3/src/dlg/dlgTable.cpp    2005-12-02 10:02:32 UTC (rev 4783)
+++ trunk/pgadmin3/src/dlg/dlgTable.cpp    2005-12-02 10:06:55 UTC (rev 4784)
@@ -513,8 +513,10 @@
                 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;