SVN Commit by andreas: r4535 - in trunk/pgadmin3: . docs/de_DE/hints docs/en_US/hints src/ctl src/dlg src/include

Author: andreas
Date: 2005-10-12 17:11:51 +0100 (Wed, 12 Oct 2005)
New Revision: 4535

Modified:
   trunk/pgadmin3/BUGS.txt
   trunk/pgadmin3/CHANGELOG.txt
   trunk/pgadmin3/docs/de_DE/hints/instrumentation.html
   trunk/pgadmin3/docs/en_US/hints/instrumentation.html
   trunk/pgadmin3/src/ctl/ctlSecurityPanel.cpp
   trunk/pgadmin3/src/dlg/dlgRole.cpp
   trunk/pgadmin3/src/dlg/dlgTable.cpp
   trunk/pgadmin3/src/include/ctlSecurityPanel.h
Log:
Fix count crash on tables (r: Merlin Moncure)
Fix 8.1 Grant WITH OPTION
better instrumentation hint
updated BUGS.txt

Modified: trunk/pgadmin3/BUGS.txt
===================================================================
--- trunk/pgadmin3/BUGS.txt    2005-10-12 15:05:56 UTC (rev 4534)
+++ trunk/pgadmin3/BUGS.txt    2005-10-12 16:11:51 UTC (rev 4535)
@@ -1,8 +1,6 @@
 <b>Known issues</b>
 <ul>
     <li>[Edit grid] bool editing doesn't know NULL; major redesign needed
-    <li>[Properties] GRANT WITH GRANT OPTION problems
-    <li>[all] suppressed public. prefix leads to modified objects in wrong schema if found in search_path
 </ul><br>
 <b>Known wxWindows issues</b>
 <ul>
@@ -23,6 +21,7 @@
 </ul><br>
 <b>Fixed issues</b>
 <ul>
+    <li>AP 2004-07-27 [all] suppressed public. prefix leads to modified objects in wrong schema if found in
search_path
     <li>DP 2004-09-18 [Object Tree] Dropped servers reappear when changing "display system objects" due to the
disconnect/treerefresh. 
     <li>AP 2004-09-18 [Database property] db creation with owner fails
     <li>AP 2004-09-18 [Server property] some changes not handled correctly

Modified: trunk/pgadmin3/CHANGELOG.txt
===================================================================
--- trunk/pgadmin3/CHANGELOG.txt    2005-10-12 15:05:56 UTC (rev 4534)
+++ trunk/pgadmin3/CHANGELOG.txt    2005-10-12 16:11:51 UTC (rev 4535)
@@ -20,83 +20,83 @@
     <li>2005-10-08 AP  1.4B2 Fix "New" context menu crash on disconnected server (r: Tomasz Rybak)
     <li>2005-10-08 AP  1.4B2 Check for catalog access privilege in pg_authid and pg_depend (r: Christopher St.John)
     <li>2005-10-04 AP  1.4B1 -t cmd line option to enable language debugging
-    <li>2005-10-03 AP        pg_autovacuum support
-    <li>2005-10-03 AP        upgrade slony node
-    <li>2005-09-17 AP        Allow Query Tool to use multiple connections
-    <li>2005-09-04 AP        use ddlscript to replicate schema changes
-    <li>2005-09-04 AP        table reverse engineering sql changes
-    <li>2005-09-04 AP        role fixes
-    <li>2005-09-04 AP        more guru hints
-    <li>2005-09-03 DP        new splash screen
-    <li>2005-08-23 AP        shared dependencies
-    <li>2005-08-21 AP        Roles
-    <li>2005-08-21 AP        smaller icons for win32
-    <li>2005-08-11 DP        New set of icons, custom designed by Niko [ennixo at free.fr]
-    <li>2005-08-11 AP        pgServerObjCollection (r: Eugene Shekhtman)
-    <li>2005-08-08 AP        Refactoring object and tool handling using class factories to make extensions easier
-    <li>2005-08-02 AP        Support for pgsql 8.1 prepared transactions
-    <li>2005-08-01 AP        Store passwords in .pgpass/pgpass.conf
-    <li>2005-08-01 AP        Allow server registration without connect
-    <li>2005-07-21 DP        Prompt the user before removing columns, constraints or inherited tables in the table
dialogue.
-    <li>2005-07-06 DP        Prompt the user to cancel running queries before closing the Query tool.
-    <li>2005-07-04 DP        Check for and display asynchronous notifications in the query tool.
-    <li>2005-06-21 AP        typo fixes, rename "initial db" to "maintenance db"
-    <li>2005-06-19 AP        pgAgent moved under server, some more fixes
-    <li>2005-06-19 AP        further translation issues
-    <li>2005-06-17 AP        reduce translation nightmare
-    <li>2005-06-17 AP        use wxDatePickCtrl for wxCalendarBox
+    <li>2005-10-03 AP  1.4   pg_autovacuum support
+    <li>2005-10-03 AP  1.4   upgrade slony node
+    <li>2005-09-17 AP  1.4   Allow Query Tool to use multiple connections
+    <li>2005-09-04 AP  1.4   use ddlscript to replicate schema changes
+    <li>2005-09-04 AP  1.4   table reverse engineering sql changes
+    <li>2005-09-04 AP  1.4   role fixes
+    <li>2005-09-04 AP  1.4   more guru hints
+    <li>2005-09-03 DP  1.4   new splash screen
+    <li>2005-08-23 AP  1.4   shared dependencies
+    <li>2005-08-21 AP  1.4   Roles
+    <li>2005-08-21 AP  1.4   smaller icons for win32
+    <li>2005-08-11 DP  1.4   New set of icons, custom designed by Niko [ennixo at free.fr]
+    <li>2005-08-11 AP  1.4   pgServerObjCollection (r: Eugene Shekhtman)
+    <li>2005-08-08 AP  1.4   Refactoring object and tool handling using class factories to make extensions easier
+    <li>2005-08-02 AP  1.4   Support for pgsql 8.1 prepared transactions
+    <li>2005-08-01 AP  1.4   Store passwords in .pgpass/pgpass.conf
+    <li>2005-08-01 AP  1.4   Allow server registration without connect
+    <li>2005-07-21 DP  1.4   Prompt the user before removing columns, constraints or inherited tables in the table
dialogue.
+    <li>2005-07-06 DP  1.4   Prompt the user to cancel running queries before closing the Query tool.
+    <li>2005-07-04 DP  1.4   Check for and display asynchronous notifications in the query tool.
+    <li>2005-06-21 AP  1.4   typo fixes, rename "initial db" to "maintenance db"
+    <li>2005-06-19 AP  1.4   pgAgent moved under server, some more fixes
+    <li>2005-06-19 AP  1.4   further translation issues
+    <li>2005-06-17 AP  1.4   reduce translation nightmare
+    <li>2005-06-17 AP  1.4   use wxDatePickCtrl for wxCalendarBox
     <li>2005-06-17 AP  1.2.3 Fix changing initial db
-    <li>2005-06-09 DP        Flash the task bar icon at the user if a query finishes and the query window is not
active.
-    <li>2005-06-09 AP        Different icons for own and foreign slony sets and subscriptions
+    <li>2005-06-09 DP  1.4   Flash the task bar icon at the user if a query finishes and the query window is not
active.
+    <li>2005-06-09 AP  1.4   Different icons for own and foreign slony sets and subscriptions
     <li>2005-06-09 DP  1.2.3 Fix disable triggers option for data only plain text backups per Howard Cole.
-    <li>2005-06-03 AP        Support for pgsql 8.1 aggregate sortop
-    <li>2005-06-03 AP        Support for pgsql 8.1 pg_stat_activity
-    <li>2005-06-03 AP        Support for pgsql 8.1 instrumentation
-    <li>2005-06-01 AP        Support for Procedures aka functions "with out-parameters"
-    <li>2005-06-01 AP        Support for EDB8.0
+    <li>2005-06-03 AP  1.4   Support for pgsql 8.1 aggregate sortop
+    <li>2005-06-03 AP  1.4   Support for pgsql 8.1 pg_stat_activity
+    <li>2005-06-03 AP  1.4   Support for pgsql 8.1 instrumentation
+    <li>2005-06-01 AP  1.4   Support for Procedures aka functions "with out-parameters"
+    <li>2005-06-01 AP  1.4   Support for EDB8.0
     <li>2005-05-31 DP  1.2.3 Fix domain RE SQL, per Ivan
     <li>2005-05-31 DP  1.2.3 Add missing ; to RE SQL, per Ivan
-    <li>2005-05-27 DP        New WiX based installer for Win32
-    <li>2005-05-25 DP        Cleanup doc location code for internal consistency
-    <li>2005-05-25 DP        Reorganise doc index, cleanup inappropriate/old docs and improve admin pack documentation
-    <li>2005-05-24 DP        Add pgAgent service/daemon, pgAdmin control interface and documentation
+    <li>2005-05-27 DP  1.4   New WiX based installer for Win32
+    <li>2005-05-25 DP  1.4   Cleanup doc location code for internal consistency
+    <li>2005-05-25 DP  1.4   Reorganise doc index, cleanup inappropriate/old docs and improve admin pack documentation
+    <li>2005-05-24 DP  1.4   Add pgAgent service/daemon, pgAdmin control interface and documentation
     <li>2005-05-10 HS  1.2.2 Display comments on contraints properly
-    <li>2005-05-08 DP        Major source code reshuffle
-    <li>2005-05-08 DP        Overhaul *nix automake build system
-    <li>2005-03-25 DP        Mac OSX support [Florian G. Pflug]
-    <li>2005-04-22 AP        more Hint enhancements
-    <li>2005-04-19 AP        Hint enhancements
-    <li>2005-04-18 AP        Unix Domain Socket additional stuff
-    <li>2005-04-18 AP        switch to wxWidgets 2.6
-    <li>2005-04-15 DP        Unix Domain Socket support as inspired by Dominique Quatravaux
-    <li>2005-04-07 AP        VACUUM hint
-    <li>2005-04-04 AP        Control dependent win32 services
-    <li>2005-04-01 AP        Speed up of column property retrieval
+    <li>2005-05-08 DP  1.4   Major source code reshuffle
+    <li>2005-05-08 DP  1.4   Overhaul *nix automake build system
+    <li>2005-03-25 DP  1.4   Mac OSX support [Florian G. Pflug]
+    <li>2005-04-22 AP  1.4   more Hint enhancements
+    <li>2005-04-19 AP  1.4   Hint enhancements
+    <li>2005-04-18 AP  1.4   Unix Domain Socket additional stuff
+    <li>2005-04-18 AP  1.4   switch to wxWidgets 2.6
+    <li>2005-04-15 DP  1.4   Unix Domain Socket support as inspired by Dominique Quatravaux
+    <li>2005-04-07 AP  1.4   VACUUM hint
+    <li>2005-04-04 AP  1.4   Control dependent win32 services
+    <li>2005-04-01 AP  1.4   Speed up of column property retrieval
     <li>2005-04-01 DP  1.2.2 Fix changing of view ownership
-    <li>2005-03-28 AP        FK MATCH FULL
-    <li>2005-03-28 AP        Option: User defined system schemas
-    <li>2005-03-27 AP        Guru hint for server connections
+    <li>2005-03-28 AP  1.4   FK MATCH FULL
+    <li>2005-03-28 AP  1.4   Option: User defined system schemas
+    <li>2005-03-27 AP  1.4   Guru hint for server connections
     <li>2005-03-25 DP  1.2.1 Correctly identify primary key columns in properties pane.
     <li>2005-03-18 DP  1.2.1 Set column stats and comments correctly when creating tables.
     <li>2005-03-18 DP  1.2.1 Include the hostname in the connect string for Kerberos support, per Magnus Hagander
-    <li>2005-03-15 DP        Fix for non-SSL enabled libpq builds [Florian G. Pflug]
-    <li>2005-03-15 HS        Mask the password on the main tab of the user properties dialogue
-    <li>2005-03-13 AP        Change plain backup file default extension to .sql
-    <li>2005-03-13 AP        Add CASCADE dropping
+    <li>2005-03-15 DP  1.4   Fix for non-SSL enabled libpq builds [Florian G. Pflug]
+    <li>2005-03-15 HS  1.4   Mask the password on the main tab of the user properties dialogue
+    <li>2005-03-13 AP  1.4   Change plain backup file default extension to .sql
+    <li>2005-03-13 AP  1.4   Add CASCADE dropping
     <li>2005-03-04 DP  1.2.1 Fix aggregate SQL generation per James Prichard
-    <li>2005-03-03 AP        graphical EXPLAIN
-    <li>2005-03-03 AP        pgAgent fixes (jobId)
-    <li>2005-03-02 DP        Rewrite pgAgent browser code to use pgCollection
-    <li>2005-02-25 AP        some more Slony-I stuff
-    <li>2005-02-24 AP        some Slony-I stuff
+    <li>2005-03-03 AP  1.4   graphical EXPLAIN
+    <li>2005-03-03 AP  1.4   pgAgent fixes (jobId)
+    <li>2005-03-02 DP  1.4   Rewrite pgAgent browser code to use pgCollection
+    <li>2005-02-25 AP  1.4   some more Slony-I stuff
+    <li>2005-02-24 AP  1.4   some Slony-I stuff
     <li>2005-02-24 AP  1.2.1 require unicode to compile utffile.cpp
-    <li>2005-02-23 AP        Slony-1 statistics
+    <li>2005-02-23 AP  1.4   Slony-1 statistics
     <li>2005-02-14 AP  1.2.1 TreeSelChange fixes (menu/statistics/dependency refresh)
-    <li>2005-02-14 AP        wx2.5.4 preparation
-    <li>2005-02-13 AP        Slony admin node, join cluster using pg_dump
+    <li>2005-02-14 AP  1.4   wx2.5.4 preparation
+    <li>2005-02-13 AP  1.4   Slony admin node, join cluster using pg_dump
     <li>2005-02-13 AP  1.2.1 Make sure IsAlive check isn't affected by dead transactions
     <li>2005-02-13 AP  1.2.1 Fix missing schema prefix for casts
-    <li>2005-02-11 AP        Slony-I support
+    <li>2005-02-11 AP  1.4   Slony-I support
     <li>2005-02-09 AP  1.2.1 fix trigger reengineering name quoting (r: Lucas Galfaso)
     <li>2005-02-07 AP  1.2.1 remove tablespace for sequences
     <li>2005-02-07 AHP 1.2.1 fix libpq/ssl library detection
@@ -109,7 +109,7 @@
     <li>2005-01-07 AP  1.2.1 fix quoting identifiers starting with numbers (r: Alexander Borkowski)
     <li>2005-01-04 AP  1.2.1 fix typo in pgDomain (r: Pascal Pochet)
     <li>2004-12-16 AP  1.2.1 fix server menu after failed connect
-    <li>2004-12-15 AP        Fix changing pg_hba.conf
+    <li>2004-12-15 AP  1.4   Fix changing pg_hba.conf
     <li>2004-12-10 AP  1.2.1 Fix missing drop confirmation (r: Cheetah)
     <li>2004-12-06 AP  1.2.1 Fix tablespace reference in namespace
     <li>2004-11-19 AP  1.2.0 catch possible false error msg

Modified: trunk/pgadmin3/docs/de_DE/hints/instrumentation.html
===================================================================
--- trunk/pgadmin3/docs/de_DE/hints/instrumentation.html    2005-10-12 15:05:56 UTC (rev 4534)
+++ trunk/pgadmin3/docs/de_DE/hints/instrumentation.html    2005-10-12 16:11:51 UTC (rev 4535)
@@ -12,5 +12,20 @@
 <p>
 Der Server hat die Instrumentierungsfunktionen nicht geladen.
 </p>
+<p>
+pgAdmin III benutzt einige Unterst�tzungsfunktionen die nicht in allen PostgreSQL Versionen per Default zur Verf�gung
+stehen. Sie erm�glichen einige Aufgaben im Umgang mit Logdateien und Konfigurationsdateien.
+</p>
+<p>
+Wenn PostgreSQL 8.0 oder neuer mit dem Windows Installer installiert wird, reicht es die "Admin Option" auszuw�hlen.
+</p>
+<p>
+Wenn PostgreSQL aus der Source kompiliert wird, k�nnen die ben�tigten Dateien im xtra Unterverzeichnis des
+pgAdmin Sourcetrees gefunden werden. F�r PostgreSQL 8.0 ist das Verzeichnis admin unter das postgresql contrib
+Sourceverzeichnis zu kopieren, make und make install f�hrt dann die Installation durch. F�r PostgreSQL 8.1 ist
+das admin81 Verzeichnis zu benutzen. Nach der Installation des Modules m�ssen die Instrumentierungsfunktionen
+in der Wartungsdatenbank erzeugt werden; hierzu dient das admin.sql Script (admin81.sql f�r PostgreSQL 8.1)
+welches �blicherweise im pgsql share Verzeichnis zu finden ist (z.B. /usr/local/pgsql/share)
+</p>
 </body>
 </html>

Modified: trunk/pgadmin3/docs/en_US/hints/instrumentation.html
===================================================================
--- trunk/pgadmin3/docs/en_US/hints/instrumentation.html    2005-10-12 15:05:56 UTC (rev 4534)
+++ trunk/pgadmin3/docs/en_US/hints/instrumentation.html    2005-10-12 16:11:51 UTC (rev 4535)
@@ -12,5 +12,26 @@
 <p>
 The server lacks instrumentation functions.
 </p>
+<p>
+pgAdmin III uses some support functions that are not available by default
+in all PostgreSQL versions. These enable some tasks that make life easier when
+dealing with log files and configuration files.
+</p>
+<p>
+When you installed PostgreSQL 8.0 or up using the Windows installer, you just need to
+check the "admin option".
+</p>
+<p>
+When compiling from source, the necessary files can be found in the xtra subdirectory
+of the pgAdmin source tree. For PostgreSQL 8.0, copy the admin directory under
+the postgresql contrib source directory, make and make install from there. For PostgreSQL 8.1,
+use the admin81 directory for that.
+After the module is installed, you need to create the instrumentation functions in
+your maintenance database using the admin.sql script (admin81.sql for PostgreSQL 8.1)
+which are usually located in the pgsql share directory (e.g. /usr/local/pgsql/share)
+</p>
+<p>
+Extended server instrumentation is not supported for PostgreSQL 7.3 and 7.4.
+</p>
 </body>
 </html>

Modified: trunk/pgadmin3/src/ctl/ctlSecurityPanel.cpp
===================================================================
--- trunk/pgadmin3/src/ctl/ctlSecurityPanel.cpp    2005-10-12 15:05:56 UTC (rev 4534)
+++ trunk/pgadmin3/src/ctl/ctlSecurityPanel.cpp    2005-10-12 16:11:51 UTC (rev 4535)
@@ -158,6 +158,12 @@
 }


+void ctlSecurityPanel::SetConnection(pgConn *conn)
+{
+    connection=conn;
+    if (connection && stGroup && connection->BackendMinimumVersion(8, 1))
+        stGroup->SetLabel(_("Role"));
+}


 wxString ctlSecurityPanel::GetGrant(const wxString &allPattern, const wxString &grantObject, wxArrayString
*currentAcl)
@@ -372,8 +378,12 @@
         return false;

     wxString user=cbGroups->GetValue();
-    if (user.Left(6).IsSameAs(wxT("group "), false) || user.IsSameAs(wxT("public"), false))
+    if (user.IsSameAs(wxT("public"), false))
         return false;

+    if (!connection->BackendMinimumVersion(8, 1) &&
+        user.Left(6).IsSameAs(wxT("group "), false))
+        return false;
+
     return true;
 }

Modified: trunk/pgadmin3/src/dlg/dlgRole.cpp
===================================================================
--- trunk/pgadmin3/src/dlg/dlgRole.cpp    2005-10-12 15:05:56 UTC (rev 4534)
+++ trunk/pgadmin3/src/dlg/dlgRole.cpp    2005-10-12 16:11:51 UTC (rev 4535)
@@ -187,6 +187,8 @@
     else
     {
         chkCanLogin->Disable();
+        wxDateTime empty;
+        datValidUntil->SetValue(empty);
         timValidUntil->Disable();
     }


Modified: trunk/pgadmin3/src/dlg/dlgTable.cpp
===================================================================
--- trunk/pgadmin3/src/dlg/dlgTable.cpp    2005-10-12 15:05:56 UTC (rev 4534)
+++ trunk/pgadmin3/src/dlg/dlgTable.cpp    2005-10-12 16:11:51 UTC (rev 4535)
@@ -1034,7 +1034,7 @@

     wxTreeItemId item=form->GetBrowser()->GetSelection();
     if (obj == form->GetBrowser()->GetObject(item))
-        obj->ShowTreeDetail(0, 0, form->GetProperties());
+        obj->ShowTreeDetail(form->GetBrowser(), 0, form->GetProperties());

     return 0;
 }

Modified: trunk/pgadmin3/src/include/ctlSecurityPanel.h
===================================================================
--- trunk/pgadmin3/src/include/ctlSecurityPanel.h    2005-10-12 15:05:56 UTC (rev 4534)
+++ trunk/pgadmin3/src/include/ctlSecurityPanel.h    2005-10-12 16:11:51 UTC (rev 4535)
@@ -44,7 +44,7 @@
     ctlListView *lbPrivileges;
     ctlComboBox *cbGroups;
     wxStaticText *stGroup;
-    void SetConnection(pgConn *conn) { connection=conn; }
+    void SetConnection(pgConn *conn);
     wxString GetGrant(const wxString &allPattern, const wxString &grantObject, wxArrayString *currentAcl=0);
 protected:
     wxNotebook *nbNotebook;