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

Author: dpage
Date: 2005-12-15 09:28:08 +0000 (Thu, 15 Dec 2005)
New Revision: 4846

Modified:
   branches/REL-1_4_0_PATCHES/pgadmin3/CHANGELOG.txt
   branches/REL-1_4_0_PATCHES/pgadmin3/src/schema/pgSchema.cpp
Log:
Exclude system schemas by name rather than OID, so that 'public' can be safely renamed.

Modified: branches/REL-1_4_0_PATCHES/pgadmin3/CHANGELOG.txt
===================================================================
--- branches/REL-1_4_0_PATCHES/pgadmin3/CHANGELOG.txt    2005-12-15 08:24:28 UTC (rev 4845)
+++ branches/REL-1_4_0_PATCHES/pgadmin3/CHANGELOG.txt    2005-12-15 09:28:08 UTC (rev 4846)
@@ -18,6 +18,10 @@
 </ul>
 <br>
 <ul>
+    <li>2005-12-15 DP  1.4.2  Exclude system schemas by name rather than OID, so that 'public' can be safely renamed.
+    <li>2005-12-12 AP  1.4.2  fix slony node statistics
+    <li>2005-12-11 AP  1.4.2  Fix: Unsubscribe set on receiver
+    <li>2005-12-11 AP  1.4.2  Another wxComboBox(2.6.2) related fix
     <li>2005-12-09 DP  1.4.1  Default the encoding of new databases to the cluster encoding, per Peter Eisentraut.
     <li>2005-12-09 DP  1.4.1  Sort encoding names in dlgDatabase, per Peter Eisentraut.
     <li>2005-12-06 AP  1.4.1  store UTF8 connect info in pgpass.conf if necessary

Modified: branches/REL-1_4_0_PATCHES/pgadmin3/src/schema/pgSchema.cpp
===================================================================
--- branches/REL-1_4_0_PATCHES/pgadmin3/src/schema/pgSchema.cpp    2005-12-15 08:24:28 UTC (rev 4845)
+++ branches/REL-1_4_0_PATCHES/pgadmin3/src/schema/pgSchema.cpp    2005-12-15 09:28:08 UTC (rev 4846)
@@ -163,8 +163,7 @@

     pgSet *schemas = collection->GetDatabase()->ExecuteSet(
         wxT("SELECT CASE WHEN nspname LIKE 'pg\\_temp\\_%%' THEN 1\n")
-        wxT("            WHEN (nsp.oid<") + NumToStr(collection->GetServer()->GetLastSystemOID()) +
-                         wxT(" OR nspname like 'pg\\_%') AND nspname != 'public' THEN 0\n")
+        wxT("            WHEN (nspname LIKE 'pg\\_%' OR nspname = 'information_schema') THEN 0\n")
         wxT("            ELSE 3 END AS nsptyp,\n")
         wxT("       nsp.nspname, nsp.oid, pg_get_userbyid(nspowner) AS namespaceowner, nspacl, description,")
         wxT("       has_schema_privilege(nsp.oid, 'CREATE') as cancreate\n")