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

Author: dpage
Date: 2005-11-04 17:14:52 +0000 (Fri, 04 Nov 2005)
New Revision: 4657

Modified:
   trunk/pgadmin3/CHANGELOG.txt
   trunk/pgadmin3/src/dlg/dlgRole.cpp
Log:
Fix role inheritance option when creating roles, per Mike Allen

Modified: trunk/pgadmin3/CHANGELOG.txt
===================================================================
--- trunk/pgadmin3/CHANGELOG.txt    2005-11-04 16:45:11 UTC (rev 4656)
+++ trunk/pgadmin3/CHANGELOG.txt    2005-11-04 17:14:52 UTC (rev 4657)
@@ -17,6 +17,7 @@
 </ul>
 <br>
 <ul>
+    <li>2005-11-04 DP  1.4RC2 Fix role inheritance option when creating roles, per Mike Allen
     <li>2005-11-03 DP  1.4RC2 Minor fix to the pgAgent command line parser, per Harald Armin Massa
     <li>2005-11-03 DP  1.4RC2 Honour type length/precision when creating composite types, per Ivan
     <li>2005-11-02 AP  1.4RC2 Fix crash in trigger property (r: Oriza Triznyak)

Modified: trunk/pgadmin3/src/dlg/dlgRole.cpp
===================================================================
--- trunk/pgadmin3/src/dlg/dlgRole.cpp    2005-11-04 16:45:11 UTC (rev 4656)
+++ trunk/pgadmin3/src/dlg/dlgRole.cpp    2005-11-04 17:14:52 UTC (rev 4657)
@@ -628,12 +628,12 @@
                 sql += wxT(" PASSWORD ") + qtString(passwd);
         }

-        if (createDB || createRole ||inherits || superuser)
+        if (createDB || createRole ||!inherits || superuser)
             sql += wxT("\n ");
         if (superuser)
             sql += wxT(" SUPERUSER");
-        if (inherits)
-            sql += wxT(" INHERIT");
+        if (!inherits)
+            sql += wxT(" NOINHERIT");
         if (createDB)
             sql += wxT(" CREATEDB");
         if (createRole)